Changeset 15892 in vbox for trunk/src/VBox

Timestamp:

Jan 12, 2009 11:05:55 AM (16 years ago)

Author:

vboxsync

Message:

VBoxNetFlt: Changed build order of Windows (un)installation tools. See comment for details.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -23 +23 @@
 include $(KBUILD_PATH)/subheader.kmk
 
+ifeq ($(KBUILD_TARGET),win)
+# Windows installation/uninstallation tools.
+# Build these before the actual driver to clean up messed
+# up installation easier.
+
+#
+# NetFltInstall
+#
+PROGRAMS.win  += NetFltInstall
+NetFltInstall_TEMPLATE = VBOXR3STATIC
+NetFltInstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
+NetFltInstall_SOURCES  = win/NetFltInstall.cpp
+NetFltInstall_LIBS     = $(PATH_LIB)/WinNetConfig.lib
+
+#
+# NetFltUninstall
+#
+PROGRAMS.win  += NetFltUninstall
+NetFltUninstall_TEMPLATE = VBOXR3STATIC
+NetFltUninstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
+NetFltUninstall_SOURCES  = win/NetFltUninstall.cpp
+NetFltUninstall_LIBS     = $(PATH_LIB)/WinNetConfig.lib
+endif
 
 if1of ($(KBUILD_TARGET), darwin win)
@@ -150 +173 @@
 WinNetConfig_SOURCES  = \
         win/WinNetConfig.cpp
-
-#
-# NetFltInstall
-#
-PROGRAMS.win  += NetFltInstall
-NetFltInstall_TEMPLATE = VBOXR3STATIC
-NetFltInstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
-NetFltInstall_SOURCES  = win/NetFltInstall.cpp
-NetFltInstall_LIBS     = $(PATH_LIB)/WinNetConfig.lib
-
-
-#
-# NetFltUninstall
-#
-PROGRAMS.win  += NetFltUninstall
-NetFltUninstall_TEMPLATE = VBOXR3STATIC
-NetFltUninstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
-NetFltUninstall_SOURCES  = win/NetFltUninstall.cpp
-NetFltUninstall_LIBS     = $(PATH_LIB)/WinNetConfig.lib
-
 
 #