Changeset 98144 in vbox for trunk/src/VBox/Installer
- Timestamp:
- Jan 19, 2023 2:52:34 PM (2 years ago)
- Location:
- trunk/src/VBox/Installer/win
- Files:
-
- 3 edited
-
MsiHack/Makefile.kmk (modified) (1 diff)
-
MsiHack/MsiHack.cpp (modified) (1 diff)
-
Stub/Makefile.kmk (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/win/MsiHack/Makefile.kmk
r98103 r98144 30 30 31 31 DLLS += MsiHack 32 MsiHack_TEMPLATE = VB OXR3STATIC32 MsiHack_TEMPLATE = VBoxR3StaticDll 33 33 MsiHack_BLD_TRG_ARCH = x86 34 34 MsiHack_SOURCES = MsiHack.cpp -
trunk/src/VBox/Installer/win/MsiHack/MsiHack.cpp
r98103 r98144 33 33 * Header Files * 34 34 *********************************************************************************************************************************/ 35 #define IPRT_NO_CRT_FOR_3RD_PARTY /* temp hack */ 35 36 #include <iprt/win/windows.h> 36 37 #include <iprt/string.h> 37 38 #include <iprt/asm.h> 38 39 #include <stdio.h> 39 #include <wchar.h> 40 #include <stdlib.h> 41 #ifndef IPRT_NO_CRT 42 # include <wchar.h> 43 #endif 40 44 41 45 -
trunk/src/VBox/Installer/win/Stub/Makefile.kmk
r98103 r98144 29 29 include $(KBUILD_PATH)/subheader.kmk 30 30 31 TEMPLATE_VBOXSTUB = Drop the signing, we will sign it later. 32 TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3STATIC 33 TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE) 31 32 # 33 # Special template variation. 34 # 35 TEMPLATE_VBoxStubTemplate := Drop the signing, we will sign it later. 36 TEMPLATE_VBoxStubTemplate_EXTENDS := VBoxR3Static 37 TEMPLATE_VBoxStubTemplate_POST_CMDS = $(NO_SUCH_VARIABLE) 38 34 39 35 40 # … … 37 42 # 38 43 PROGRAMS += VBoxStub 39 VBoxStub_TEMPLATE = VBOXSTUB40 VBoxStub_BLD_TRG_ARCH = x8641 VBoxStub_DEFS = _WIN32_WINNT=0x0501 IN_RT_R344 VBoxStub_TEMPLATE := VBoxStubTemplate 45 VBoxStub_BLD_TRG_ARCH := x86 46 VBoxStub_DEFS := _WIN32_WINNT=0x0501 IN_RT_R3 42 47 43 48 VBoxStub_SOURCES = \ … … 45 50 VBoxStub.rc 46 51 47 VBoxStub_SDKS += \52 VBoxStub_SDKS = \ 48 53 VBOX_NTDLL 49 ifeq ($(KBUILD_TARGET_ARCH),x86)50 54 VBoxStub_LIBS += \ 51 $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib \ 52 $(VBOX_LIB_RUNTIME_STATIC) 53 else 54 VBoxStub_LIBS += \ 55 $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/delayimp.lib \ 56 $(PATH_STAGE_LIB)/RuntimeR3-x86.lib 57 endif 55 $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/delayimp.lib 58 56 59 57 VBoxStub_LDFLAGS = -SubSystem:Windows -DelayLoad:comctl32.dll
Note:
See TracChangeset
for help on using the changeset viewer.
