Changeset 98302 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Jan 25, 2023 9:07:43 AM (23 months ago)

Author:

vboxsync

Message:

FE/SDL. bugref:9449. Removing secure label related code.

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxMergeApp.wxi (modified) (1 diff)

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

@@ -714 +714 @@
                 -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
                 -E 'VBOX_WITH_RAW_MODE=$(if $(VBOX_WITH_RAW_MODE),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_WITH_VIDEOHWACCEL=$(if $(VBOX_WITH_VIDEOHWACCEL),yes,no)' \
@@ -877 +876 @@
                 -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
                 -E 'VBOX_WITH_RAW_MODE=$(if $(VBOX_WITH_RAW_MODE),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_WITH_VIDEOHWACCEL=$(if $(VBOX_WITH_VIDEOHWACCEL),yes,no)' \

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -464 +464 @@
         <File Id="file_SDL.dll" Name="SDL.dll"
               Source="$(env.PATH_OUT)\bin\SDL.dll" />
-    <?if $(env.VBOX_WITH_SECURELABEL) = "yes" ?>
-            <File Id="file_SDL_ttf.dll" Name="SDL_ttf.dll"
-                  Source="$(env.PATH_OUT)\bin\SDL_ttf.dll" />
-    <?endif?>
     </Component> <!-- SDL frontend -->
 <?endif ?>