Changeset 31922 in vbox for trunk/src/VBox

Timestamp:

Aug 24, 2010 12:56:20 PM (14 years ago)

Author:

vboxsync

Message:

OSE build fix

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (1 diff)
• VirtualBox.wxs (modified) (1 diff)

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -387 +387 @@
                 -E 'VBOX_WITH_VRDP=$(if $(VBOX_WITH_VRDP),yes,no)' \
                 -E 'VBOX_WITH_WEBSERVICES=$(if $(VBOX_WITH_WEBSERVICES),yes,no)' \
+                -E 'VBOX_WITH_SECURELABEL=$(if $(VBOX_WITH_SECURELABEL),yes,no)' \
                 -E 'VBOX_WITH_SERIALNUMBER_INSTALL=$(if $(VBOX_WITH_SERIALNUMBER_INSTALL),yes,no)' \
                 -E 'VBOX_WINDOWS_ICON_FILE=$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))' \

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -571 +571 @@
                         <File Id="sdldll" Name="SDL.dll" DiskId="1" Vital="yes"
                               Source="$(env.PATH_OUT)\bin\SDL.dll" />
-<!-- todo: make the sdlttf available as an env var instead of this hack -->
-<?if $(env.BUILD_TARGET_ARCH) != "amd64" ?>
+<?if $(env.VBOX_WITH_SECURELABEL) = "yes" ?>
                         <File Id="sdlttfdll" Name="SDL_ttf.dll" DiskId="1" Vital="yes"
                               Source="$(env.PATH_OUT)\bin\SDL_ttf.dll" />