- Timestamp:
- Jan 21, 2023 10:37:53 PM (21 months ago)
- Location:
- trunk
- Files:
-
- 5 edited
-
Config.kmk (modified) (12 diffs)
-
include/Makefile.kmk (modified) (1 diff)
-
src/VBox/Main/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Main/cbinding/Makefile.kmk (modified) (1 diff)
-
src/VBox/Main/src-helper-apps/OpenGLTest/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r98181 r98183 7032 7032 # (COM/XPCOM interface to VirtualBox). 7033 7033 # 7034 TEMPLATE_VB OXMAINEXE= VBox Main Executable7035 TEMPLATE_VB OXMAINEXE_ASTOOL := $(VBOX_ASTOOL)7036 TEMPLATE_VB OXMAINEXE_ASFLAGS = $(VBOX_ASFLAGS)7037 TEMPLATE_VB OXMAINEXE_DEFS = IN_RING3 UNICODE NDEBUG=17038 TEMPLATE_VB OXMAINEXE_DEFS.win = _UNICODE7039 TEMPLATE_VB OXMAINEXE_RCDEFS = $(TEMPLATE_VBoxR3Exe_RCDEFS)7040 TEMPLATE_VB OXMAINEXE_LIBS.kprofile = $(LIB_KPROFILE)7041 TEMPLATE_VB OXMAINEXE_USES = dtrace7034 TEMPLATE_VBoxMainExe = VBox Main Executable 7035 TEMPLATE_VBoxMainExe_ASTOOL := $(VBOX_ASTOOL) 7036 TEMPLATE_VBoxMainExe_ASFLAGS = $(VBOX_ASFLAGS) 7037 TEMPLATE_VBoxMainExe_DEFS = IN_RING3 UNICODE NDEBUG=1 7038 TEMPLATE_VBoxMainExe_DEFS.win = _UNICODE 7039 TEMPLATE_VBoxMainExe_RCDEFS = $(TEMPLATE_VBoxR3Exe_RCDEFS) 7040 TEMPLATE_VBoxMainExe_LIBS.kprofile = $(LIB_KPROFILE) 7041 TEMPLATE_VBoxMainExe_USES = dtrace 7042 7042 if defined(VBOX_WITH_DTRACE_R3_MAIN) && defined(VBOX_WITH_NATIVE_DTRACE) 7043 TEMPLATE_VB OXMAINEXE_DTRACETOOL = DTraceAndVBoxTpG7044 TEMPLATE_VB OXMAINEXE_DTRACE_OBJ_FLAGS = -C7045 TEMPLATE_VB OXMAINEXE_DTRACE_HDR_FLAGS = -C7046 TEMPLATE_VB OXMAINEXE_DEFS += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3 VBOX_WITH_DTRACE_R3_MAIN VBOX_WITH_NATIVE_DTRACE7043 TEMPLATE_VBoxMainExe_DTRACETOOL = DTraceAndVBoxTpG 7044 TEMPLATE_VBoxMainExe_DTRACE_OBJ_FLAGS = -C 7045 TEMPLATE_VBoxMainExe_DTRACE_HDR_FLAGS = -C 7046 TEMPLATE_VBoxMainExe_DEFS += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3 VBOX_WITH_DTRACE_R3_MAIN VBOX_WITH_NATIVE_DTRACE 7047 7047 else 7048 TEMPLATE_VB OXMAINEXE_DTRACE_HDR_FLAGS = --ring-3-context7049 TEMPLATE_VB OXMAINEXE_DTRACE_OBJ_FLAGS = --ring-3-context --pic --probe-fn-imported --probe-fn-name "SUPTracerFireProbe"7048 TEMPLATE_VBoxMainExe_DTRACE_HDR_FLAGS = --ring-3-context 7049 TEMPLATE_VBoxMainExe_DTRACE_OBJ_FLAGS = --ring-3-context --pic --probe-fn-imported --probe-fn-name "SUPTracerFireProbe" 7050 7050 if defined(VBOX_WITH_DTRACE_R3_MAIN) 7051 TEMPLATE_VB OXMAINEXE_DTRACETOOL = VBoxTpG7052 TEMPLATE_VB OXMAINEXE_DEFS += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3 VBOX_WITH_DTRACE_R3_MAIN7051 TEMPLATE_VBoxMainExe_DTRACETOOL = VBoxTpG 7052 TEMPLATE_VBoxMainExe_DEFS += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3 VBOX_WITH_DTRACE_R3_MAIN 7053 7053 else 7054 TEMPLATE_VB OXMAINEXE_DTRACETOOL = VBoxTpG-Disabled7054 TEMPLATE_VBoxMainExe_DTRACETOOL = VBoxTpG-Disabled 7055 7055 endif 7056 7056 endif 7057 7057 7058 7058 ifeq ($(KBUILD_TARGET),win) 7059 #TEMPLATE_VB OXMAINEXE_TOOL = $(VBOX_VCC_TOOL)7060 TEMPLATE_VB OXMAINEXE_TOOL.win.x86 = $(VBOX_VCC_TOOL_STEM)X867061 TEMPLATE_VB OXMAINEXE_TOOL.win.amd64 = $(VBOX_VCC_TOOL_STEM)AMD647059 #TEMPLATE_VBoxMainExe_TOOL = $(VBOX_VCC_TOOL) 7060 TEMPLATE_VBoxMainExe_TOOL.win.x86 = $(VBOX_VCC_TOOL_STEM)X86 7061 TEMPLATE_VBoxMainExe_TOOL.win.amd64 = $(VBOX_VCC_TOOL_STEM)AMD64 7062 7062 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140" 7063 TEMPLATE_VB OXMAINEXE_SDKS = ReorderCompilerIncs WINSDK10-UCRT $(VBOX_WINPSDK) $(VBOX_WINDDK)7063 TEMPLATE_VBoxMainExe_SDKS = ReorderCompilerIncs WINSDK10-UCRT $(VBOX_WINPSDK) $(VBOX_WINDDK) 7064 7064 else 7065 TEMPLATE_VB OXMAINEXE_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)7066 endif 7067 TEMPLATE_VB OXMAINEXE_CXXFLAGS = -Zi -Zl -GR -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -Zc:wchar_t- \7065 TEMPLATE_VBoxMainExe_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) 7066 endif 7067 TEMPLATE_VBoxMainExe_CXXFLAGS = -Zi -Zl -GR -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -Zc:wchar_t- \ 7068 7068 $(VBOX_VCC_OPT) $(VBOX_VCC_FP) $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS) $(VBOX_VCC_std) 7069 7069 # -wd4625: 'DisplaySourceBitmap' : copy constructor could not be generated because a base class copy constructor is inaccessible … … 7071 7071 # The two above can be cured by adding private: DECLARE_CLS_COPY_CTOR_ASSIGN_NOOP(xxxx); but too much work. 7072 7072 # -wd4355: 'this' : used in base member initializer list (e.g. VirtualBoxBase.cpp) 7073 TEMPLATE_VB OXMAINEXE_CXXFLAGS += $(VBOX_VCC_WARN_ALL) -wd4625 -wd4626 -wd4355 $(VBOX_VCC_WERR)7074 TEMPLATE_VB OXMAINEXE_CXXFLAGS += -Gy7073 TEMPLATE_VBoxMainExe_CXXFLAGS += $(VBOX_VCC_WARN_ALL) -wd4625 -wd4626 -wd4355 $(VBOX_VCC_WERR) 7074 TEMPLATE_VBoxMainExe_CXXFLAGS += -Gy 7075 7075 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC120" 7076 TEMPLATE_VB OXMAINEXE_CXXFLAGS += -Gw7076 TEMPLATE_VBoxMainExe_CXXFLAGS += -Gw 7077 7077 endif 7078 7078 ifdef VBOX_WITH_MSC_ANALYZE_THIS 7079 TEMPLATE_VB OXMAINEXE_CXXFLAGS += /analyze7080 endif 7081 TEMPLATE_VB OXMAINEXE_CXXFLAGS.debug = -RTCsu7082 TEMPLATE_VB OXMAINEXE_CXXFLAGS.dbgopt = $(NO_SUCH_VARIABLE)7083 TEMPLATE_VB OXMAINEXE_CXXFLAGS.kprofile = -Gh -GH7084 TEMPLATE_VB OXMAINEXE_CFLAGS = $(filter-out $(VBOX_VCC_std),$(TEMPLATE_VBOXMAINEXE_CXXFLAGS))7085 TEMPLATE_VB OXMAINEXE_CFLAGS.debug = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug)7086 TEMPLATE_VB OXMAINEXE_CFLAGS.dbgopt = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.dbgopt)7087 TEMPLATE_VB OXMAINEXE_CFLAGS.kprofile = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile)7088 TEMPLATE_VB OXMAINEXE_PCHFLAGS = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS)7089 TEMPLATE_VB OXMAINEXE_PCHFLAGS.debug = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug)7090 TEMPLATE_VB OXMAINEXE_PCHFLAGS.dbgopt = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.dbgopt)7091 TEMPLATE_VB OXMAINEXE_PCHFLAGS.kprofile = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile)7092 TEMPLATE_VB OXMAINEXE_LDFLAGS = -Ignore:4197 \7079 TEMPLATE_VBoxMainExe_CXXFLAGS += /analyze 7080 endif 7081 TEMPLATE_VBoxMainExe_CXXFLAGS.debug = -RTCsu 7082 TEMPLATE_VBoxMainExe_CXXFLAGS.dbgopt = $(NO_SUCH_VARIABLE) 7083 TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile = -Gh -GH 7084 TEMPLATE_VBoxMainExe_CFLAGS = $(filter-out $(VBOX_VCC_std),$(TEMPLATE_VBoxMainExe_CXXFLAGS)) 7085 TEMPLATE_VBoxMainExe_CFLAGS.debug = $(TEMPLATE_VBoxMainExe_CXXFLAGS.debug) 7086 TEMPLATE_VBoxMainExe_CFLAGS.dbgopt = $(TEMPLATE_VBoxMainExe_CXXFLAGS.dbgopt) 7087 TEMPLATE_VBoxMainExe_CFLAGS.kprofile = $(TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile) 7088 TEMPLATE_VBoxMainExe_PCHFLAGS = $(TEMPLATE_VBoxMainExe_CXXFLAGS) 7089 TEMPLATE_VBoxMainExe_PCHFLAGS.debug = $(TEMPLATE_VBoxMainExe_CXXFLAGS.debug) 7090 TEMPLATE_VBoxMainExe_PCHFLAGS.dbgopt = $(TEMPLATE_VBoxMainExe_CXXFLAGS.dbgopt) 7091 TEMPLATE_VBoxMainExe_PCHFLAGS.kprofile = $(TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile) 7092 TEMPLATE_VBoxMainExe_LDFLAGS = -Ignore:4197 \ 7093 7093 /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LargeAddressAware /DynamicBase /NxCompat /Release /Debug /Opt:Ref /Opt:Icf \ 7094 7094 $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS) \ … … 7108 7108 /DISALLOWLIB:libucrtd.lib 7109 7109 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_HARDENING) 7110 TEMPLATE_VB OXMAINEXE_LDFLAGS += -IntegrityCheck7110 TEMPLATE_VBoxMainExe_LDFLAGS += -IntegrityCheck 7111 7111 endif 7112 7112 ifdef VBOX_WITH_DTRACE_R3_MAIN 7113 TEMPLATE_VB OXMAINEXE_LDFLAGS += -Merge:VTGPrLc.Data=VTGPrLc.Begin -Merge:VTGPrLc.End=VTGPrLc.Begin -Merge:VTGPrLc.Begin=VTGObj7114 endif 7115 TEMPLATE_VB OXMAINEXE_LDFLAGS.win.amd64 = $(VBOX_VCC_LD_HIGH_ENTRYOPY_VA)7116 TEMPLATE_VB OXMAINEXE_LIBS = \7113 TEMPLATE_VBoxMainExe_LDFLAGS += -Merge:VTGPrLc.Data=VTGPrLc.Begin -Merge:VTGPrLc.End=VTGPrLc.Begin -Merge:VTGPrLc.Begin=VTGObj 7114 endif 7115 TEMPLATE_VBoxMainExe_LDFLAGS.win.amd64 = $(VBOX_VCC_LD_HIGH_ENTRYOPY_VA) 7116 TEMPLATE_VBoxMainExe_LIBS = \ 7117 7117 $(LIB_RUNTIME) 7118 7118 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140" 7119 TEMPLATE_VB OXMAINEXE_LIBS.x86 = \7120 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.x86)_LIB)/vcruntime$(VBOX_VCC_CRT_TYPE).lib \7121 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.x86)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \7122 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.x86)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \7123 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.x86)_LIB)/oldnames.lib7124 TEMPLATE_VB OXMAINEXE_LIBS.amd64 = \7125 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.amd64)_LIB)/vcruntime$(VBOX_VCC_CRT_TYPE).lib \7126 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.amd64)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \7127 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.amd64)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \7128 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.amd64)_LIB)/oldnames.lib7119 TEMPLATE_VBoxMainExe_LIBS.x86 = \ 7120 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.x86)_LIB)/vcruntime$(VBOX_VCC_CRT_TYPE).lib \ 7121 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.x86)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \ 7122 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.x86)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \ 7123 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.x86)_LIB)/oldnames.lib 7124 TEMPLATE_VBoxMainExe_LIBS.amd64 = \ 7125 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.amd64)_LIB)/vcruntime$(VBOX_VCC_CRT_TYPE).lib \ 7126 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.amd64)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \ 7127 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.amd64)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \ 7128 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.amd64)_LIB)/oldnames.lib 7129 7129 ifeq ($(KBUILD_TYPE),asan) 7130 TEMPLATE_VB OXMAINEXE_LIBS.x86 += \7131 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.x86)_LIB)/clang_rt.asan_dynamic-i386.lib \7132 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.x86)_LIB)/clang_rt.asan_dynamic_runtime_thunk-i386.lib7133 TEMPLATE_VB OXMAINEXE_LIBS.amd64 += \7134 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.amd64)_LIB)/clang_rt.asan_dynamic-x86_64.lib \7135 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.amd64)_LIB)/clang_rt.asan_dynamic_runtime_thunk-x86_64.lib7130 TEMPLATE_VBoxMainExe_LIBS.x86 += \ 7131 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.x86)_LIB)/clang_rt.asan_dynamic-i386.lib \ 7132 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.x86)_LIB)/clang_rt.asan_dynamic_runtime_thunk-i386.lib 7133 TEMPLATE_VBoxMainExe_LIBS.amd64 += \ 7134 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.amd64)_LIB)/clang_rt.asan_dynamic-x86_64.lib \ 7135 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.amd64)_LIB)/clang_rt.asan_dynamic_runtime_thunk-x86_64.lib 7136 7136 endif 7137 7137 else 7138 TEMPLATE_VB OXMAINEXE_LIBS.x86 = \7139 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.x86)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \7140 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.x86)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \7141 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.x86)_LIB)/oldnames.lib7142 TEMPLATE_VB OXMAINEXE_LIBS.amd64 = \7143 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.amd64)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \7144 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.amd64)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \7145 $(PATH_TOOL_$(TEMPLATE_VB OXMAINEXE_TOOL.win.amd64)_LIB)/oldnames.lib7146 endif 7147 TEMPLATE_VB OXMAINEXE_POST_CMDS = $(VBOX_UTF8_MANIFEST_CMDS)$(NLTAB)$(VBOX_SIGN_IMAGE_CMDS)7148 TEMPLATE_VB OXMAINEXE_ORDERDEPS = $(VBOX_SIGN_IMAGE_CMDS_ORDERDEPS)7138 TEMPLATE_VBoxMainExe_LIBS.x86 = \ 7139 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.x86)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \ 7140 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.x86)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \ 7141 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.x86)_LIB)/oldnames.lib 7142 TEMPLATE_VBoxMainExe_LIBS.amd64 = \ 7143 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.amd64)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \ 7144 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.amd64)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \ 7145 $(PATH_TOOL_$(TEMPLATE_VBoxMainExe_TOOL.win.amd64)_LIB)/oldnames.lib 7146 endif 7147 TEMPLATE_VBoxMainExe_POST_CMDS = $(VBOX_UTF8_MANIFEST_CMDS)$(NLTAB)$(VBOX_SIGN_IMAGE_CMDS) 7148 TEMPLATE_VBoxMainExe_ORDERDEPS = $(VBOX_SIGN_IMAGE_CMDS_ORDERDEPS) 7149 7149 7150 7150 else # the GCC guys: 7151 7151 7152 TEMPLATE_VB OXMAINEXE_TOOL = $(VBOX_GCC_TOOL)7152 TEMPLATE_VBoxMainExe_TOOL = $(VBOX_GCC_TOOL) 7153 7153 if $(VBOX_GCC_VERSION_CC) < 30400 7154 TEMPLATE_VB OXMAINEXE_DEFS += RT_WITHOUT_PRAGMA_ONCE7155 endif 7156 TEMPLATE_VB OXMAINEXE_CXXFLAGS = -g $(VBOX_GCC_pipe) \7154 TEMPLATE_VBoxMainExe_DEFS += RT_WITHOUT_PRAGMA_ONCE 7155 endif 7156 TEMPLATE_VBoxMainExe_CXXFLAGS = -g $(VBOX_GCC_pipe) \ 7157 7157 $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_Wno-multistatement-macros) $(VBOX_GCC_Wno-class-memaccess) -Wshadow \ 7158 7158 -fshort-wchar -fpermissive -fexceptions -frtti $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing \ … … 7160 7160 $(VBOX_GCC_SANITIZER_FLAGS) 7161 7161 if !defined("VBOX_GCC_Wno-delete-non-virtual-dtor") && defined("VBOX_GCC_Wno-non-virtual-dtor") 7162 TEMPLATE_VB OXMAINEXE_CXXFLAGS += $(VBOX_GCC_Wno-non-virtual-dtor)7162 TEMPLATE_VBoxMainExe_CXXFLAGS += $(VBOX_GCC_Wno-non-virtual-dtor) 7163 7163 endif 7164 7164 ifdef VBOX_WITH_NO_GCC_WARNING_POLICY 7165 TEMPLATE_VB OXMAINEXE_CXXFLAGS += $(VBOX_GCC_WERR)7165 TEMPLATE_VBoxMainExe_CXXFLAGS += $(VBOX_GCC_WERR) 7166 7166 endif 7167 7167 ifdef VBOX_WITH_DTRACE_R3_MAIN 7168 TEMPLATE_VB OXMAINEXE_CXXFLAGS := $(filter-out -pedantic,$(TEMPLATE_VBOXMAINEXE_CXXFLAGS)) -fdollars-in-identifiers # annoying gcc option precedence.7169 endif 7170 TEMPLATE_VB OXMAINEXE_CXXFLAGS.x86 = -m327171 TEMPLATE_VB OXMAINEXE_CXXFLAGS.amd64 = -m647172 TEMPLATE_VB OXMAINEXE_CXXFLAGS.kprofile = -finstrument-functions7173 TEMPLATE_VB OXMAINEXE_CFLAGS = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) \7168 TEMPLATE_VBoxMainExe_CXXFLAGS := $(filter-out -pedantic,$(TEMPLATE_VBoxMainExe_CXXFLAGS)) -fdollars-in-identifiers # annoying gcc option precedence. 7169 endif 7170 TEMPLATE_VBoxMainExe_CXXFLAGS.x86 = -m32 7171 TEMPLATE_VBoxMainExe_CXXFLAGS.amd64 = -m64 7172 TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile = -finstrument-functions 7173 TEMPLATE_VBoxMainExe_CFLAGS = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) \ 7174 7174 $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK) \ 7175 7175 $(VBOX_GCC_SANITIZER_FLAGS) 7176 7176 ifdef VBOX_WITH_NO_GCC_WARNING_POLICY 7177 TEMPLATE_VB OXMAINEXE_CFLAGS += $(VBOX_GCC_WERR)7178 endif 7179 TEMPLATE_VB OXMAINEXE_CFLAGS.x86 = -m327180 TEMPLATE_VB OXMAINEXE_CFLAGS.amd64 = -m647181 TEMPLATE_VB OXMAINEXE_CFLAGS.kprofile = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile)7182 TEMPLATE_VB OXMAINEXE_CFLAGS.debug = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug)7183 TEMPLATE_VB OXMAINEXE_OBJCFLAGS = $(TEMPLATE_VBOXMAINEXE_CFLAGS)7184 TEMPLATE_VB OXMAINEXE_OBJCFLAGS.x86 = $(TEMPLATE_VBOXMAINEXE_CFLAGS.x86)7185 TEMPLATE_VB OXMAINEXE_OBJCFLAGS.amd64 = $(TEMPLATE_VBOXMAINEXE_CFLAGS.amd64)7186 TEMPLATE_VB OXMAINEXE_OBJCFLAGS.debug = $(TEMPLATE_VBOXMAINEXE_CFLAGS.debug)7187 TEMPLATE_VB OXMAINEXE_OBJCFLAGS.kprofile = $(TEMPLATE_VBOXMAINEXE_CFLAGS.kprofile)7188 TEMPLATE_VB OXMAINEXE_OBJCXXFLAGS = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS)7189 TEMPLATE_VB OXMAINEXE_OBJCXXFLAGS.x86 = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.x86)7190 TEMPLATE_VB OXMAINEXE_OBJCXXFLAGS.amd64 = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.amd64)7191 TEMPLATE_VB OXMAINEXE_OBJCXXFLAGS.debug = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug)7192 TEMPLATE_VB OXMAINEXE_OBJCXXFLAGS.kprofile= $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile)7193 TEMPLATE_VB OXMAINEXE_PCHFLAGS = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS)7194 TEMPLATE_VB OXMAINEXE_PCHFLAGS.x86 = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.x86)7195 TEMPLATE_VB OXMAINEXE_PCHFLAGS.amd64 = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.amd64)7196 TEMPLATE_VB OXMAINEXE_PCHFLAGS.debug = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug)7197 TEMPLATE_VB OXMAINEXE_PCHFLAGS.kprofile = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile)7198 TEMPLATE_VB OXMAINEXE_LDFLAGS = $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS)7199 TEMPLATE_VB OXMAINEXE_LDFLAGS.x86 = -m327200 TEMPLATE_VB OXMAINEXE_LDFLAGS.amd64 = -m647177 TEMPLATE_VBoxMainExe_CFLAGS += $(VBOX_GCC_WERR) 7178 endif 7179 TEMPLATE_VBoxMainExe_CFLAGS.x86 = -m32 7180 TEMPLATE_VBoxMainExe_CFLAGS.amd64 = -m64 7181 TEMPLATE_VBoxMainExe_CFLAGS.kprofile = $(TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile) 7182 TEMPLATE_VBoxMainExe_CFLAGS.debug = $(TEMPLATE_VBoxMainExe_CXXFLAGS.debug) 7183 TEMPLATE_VBoxMainExe_OBJCFLAGS = $(TEMPLATE_VBoxMainExe_CFLAGS) 7184 TEMPLATE_VBoxMainExe_OBJCFLAGS.x86 = $(TEMPLATE_VBoxMainExe_CFLAGS.x86) 7185 TEMPLATE_VBoxMainExe_OBJCFLAGS.amd64 = $(TEMPLATE_VBoxMainExe_CFLAGS.amd64) 7186 TEMPLATE_VBoxMainExe_OBJCFLAGS.debug = $(TEMPLATE_VBoxMainExe_CFLAGS.debug) 7187 TEMPLATE_VBoxMainExe_OBJCFLAGS.kprofile = $(TEMPLATE_VBoxMainExe_CFLAGS.kprofile) 7188 TEMPLATE_VBoxMainExe_OBJCXXFLAGS = $(TEMPLATE_VBoxMainExe_CXXFLAGS) 7189 TEMPLATE_VBoxMainExe_OBJCXXFLAGS.x86 = $(TEMPLATE_VBoxMainExe_CXXFLAGS.x86) 7190 TEMPLATE_VBoxMainExe_OBJCXXFLAGS.amd64 = $(TEMPLATE_VBoxMainExe_CXXFLAGS.amd64) 7191 TEMPLATE_VBoxMainExe_OBJCXXFLAGS.debug = $(TEMPLATE_VBoxMainExe_CXXFLAGS.debug) 7192 TEMPLATE_VBoxMainExe_OBJCXXFLAGS.kprofile= $(TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile) 7193 TEMPLATE_VBoxMainExe_PCHFLAGS = $(TEMPLATE_VBoxMainExe_CXXFLAGS) 7194 TEMPLATE_VBoxMainExe_PCHFLAGS.x86 = $(TEMPLATE_VBoxMainExe_CXXFLAGS.x86) 7195 TEMPLATE_VBoxMainExe_PCHFLAGS.amd64 = $(TEMPLATE_VBoxMainExe_CXXFLAGS.amd64) 7196 TEMPLATE_VBoxMainExe_PCHFLAGS.debug = $(TEMPLATE_VBoxMainExe_CXXFLAGS.debug) 7197 TEMPLATE_VBoxMainExe_PCHFLAGS.kprofile = $(TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile) 7198 TEMPLATE_VBoxMainExe_LDFLAGS = $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS) 7199 TEMPLATE_VBoxMainExe_LDFLAGS.x86 = -m32 7200 TEMPLATE_VBoxMainExe_LDFLAGS.amd64 = -m64 7201 7201 ifeq ($(KBUILD_TARGET),linux) 7202 TEMPLATE_VB OXMAINEXE_LIBS = pthread m rt $(LIB_RUNTIME) dl7203 TEMPLATE_VB OXMAINEXE_LDFLAGS.linux = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)7202 TEMPLATE_VBoxMainExe_LIBS = pthread m rt $(LIB_RUNTIME) dl 7203 TEMPLATE_VBoxMainExe_LDFLAGS.linux = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed) 7204 7204 else ifeq ($(KBUILD_TARGET),os2) 7205 TEMPLATE_VB OXMAINEXE_TOOL = GXX3OMF7206 TEMPLATE_VB OXMAINEXE_LIBS = $(LIB_RUNTIME)7205 TEMPLATE_VBoxMainExe_TOOL = GXX3OMF 7206 TEMPLATE_VBoxMainExe_LIBS = $(LIB_RUNTIME) 7207 7207 else ifeq ($(KBUILD_TARGET),darwin) 7208 TEMPLATE_VB OXMAINEXE_TOOL = $(VBOX_GCC_TOOL)7209 TEMPLATE_VB OXMAINEXE_SDKS += $(VBOX_DARWIN_DEF_SDK_SDKS)7210 TEMPLATE_VB OXMAINEXE_DEFS += $(VBOX_DARWIN_DEF_SDK_DEFS)7211 TEMPLATE_VB OXMAINEXE_CFLAGS += $(VBOX_DARWIN_DEF_SDK_CFLAGS)7212 TEMPLATE_VB OXMAINEXE_CXXFLAGS += $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)7213 TEMPLATE_VB OXMAINEXE_OBJCFLAGS += $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS)7214 TEMPLATE_VB OXMAINEXE_OBJCXXFLAGS += $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS)7215 TEMPLATE_VB OXMAINEXE_LDFLAGS.darwin += -bind_at_load7216 TEMPLATE_VB OXMAINEXE_LDFLAGS += $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -framework Carbon -Wl,-headerpad_max_install_names7217 TEMPLATE_VB OXMAINEXE_LIBS = $(LIB_RUNTIME)7218 TEMPLATE_VB OXMAINEXE_POST_CMDS.darwin = $(VBOX_SIGN_IMAGE_CMDS)7208 TEMPLATE_VBoxMainExe_TOOL = $(VBOX_GCC_TOOL) 7209 TEMPLATE_VBoxMainExe_SDKS += $(VBOX_DARWIN_DEF_SDK_SDKS) 7210 TEMPLATE_VBoxMainExe_DEFS += $(VBOX_DARWIN_DEF_SDK_DEFS) 7211 TEMPLATE_VBoxMainExe_CFLAGS += $(VBOX_DARWIN_DEF_SDK_CFLAGS) 7212 TEMPLATE_VBoxMainExe_CXXFLAGS += $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) 7213 TEMPLATE_VBoxMainExe_OBJCFLAGS += $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS) 7214 TEMPLATE_VBoxMainExe_OBJCXXFLAGS += $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS) 7215 TEMPLATE_VBoxMainExe_LDFLAGS.darwin += -bind_at_load 7216 TEMPLATE_VBoxMainExe_LDFLAGS += $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -framework Carbon -Wl,-headerpad_max_install_names 7217 TEMPLATE_VBoxMainExe_LIBS = $(LIB_RUNTIME) 7218 TEMPLATE_VBoxMainExe_POST_CMDS.darwin = $(VBOX_SIGN_IMAGE_CMDS) 7219 7219 else ifeq ($(KBUILD_TARGET),haiku) 7220 TEMPLATE_VB OXMAINEXE_TOOL = GXX37221 TEMPLATE_VB OXMAINEXE_LIBS = $(LIB_RUNTIME) network stdc++ supc++7220 TEMPLATE_VBoxMainExe_TOOL = GXX3 7221 TEMPLATE_VBoxMainExe_LIBS = $(LIB_RUNTIME) network stdc++ supc++ 7222 7222 else if1of ($(KBUILD_TARGET), freebsd openbsd) 7223 TEMPLATE_VB OXMAINEXE_TOOL = GXX37224 TEMPLATE_VB OXMAINEXE_LIBS = $(LIB_RUNTIME)7225 TEMPLATE_VB OXMAINEXE_INCS += \7223 TEMPLATE_VBoxMainExe_TOOL = GXX3 7224 TEMPLATE_VBoxMainExe_LIBS = $(LIB_RUNTIME) 7225 TEMPLATE_VBoxMainExe_INCS += \ 7226 7226 /usr/include \ 7227 7227 /usr/X11R6/include \ 7228 7228 /usr/local/include 7229 TEMPLATE_VB OXMAINEXE_LIBPATH += \7229 TEMPLATE_VBoxMainExe_LIBPATH += \ 7230 7230 /usr/lib \ 7231 7231 /usr/X11R6/lib \ 7232 7232 /usr/local/lib 7233 7233 else ifeq ($(KBUILD_TARGET),netbsd) 7234 TEMPLATE_VB OXMAINEXE_TOOL = GXX37235 TEMPLATE_VB OXMAINEXE_LIBS = $(LIB_RUNTIME)7236 TEMPLATE_VB OXMAINEXE_INCS += \7234 TEMPLATE_VBoxMainExe_TOOL = GXX3 7235 TEMPLATE_VBoxMainExe_LIBS = $(LIB_RUNTIME) 7236 TEMPLATE_VBoxMainExe_INCS += \ 7237 7237 /usr/include \ 7238 7238 /usr/X11R7/include 7239 TEMPLATE_VB OXMAINEXE_LIBPATH += \7239 TEMPLATE_VBoxMainExe_LIBPATH += \ 7240 7240 /usr/lib \ 7241 7241 /usr/X11R7/lib 7242 7242 else ifeq ($(KBUILD_TARGET),solaris) 7243 TEMPLATE_VB OXMAINEXE_TOOL = GXX3PLAIN7244 TEMPLATE_VB OXMAINEXE_DEFS += _REENTRANT7245 TEMPLATE_VB OXMAINEXE_LIBS = $(LIB_RUNTIME) rt thread7243 TEMPLATE_VBoxMainExe_TOOL = GXX3PLAIN 7244 TEMPLATE_VBoxMainExe_DEFS += _REENTRANT 7245 TEMPLATE_VBoxMainExe_LIBS = $(LIB_RUNTIME) rt thread 7246 7246 else 7247 7247 $(warning Warning: VBOX Build: Target $(KBUILD_TARGET) is not officially supported!) 7248 TEMPLATE_VB OXMAINEXE_LIBS =7249 endif 7250 TEMPLATE_VB OXMAINEXE_LDFLAGS.solaris = -Wl,-z,ignore # Same as VBOX_LD_as_needed.7248 TEMPLATE_VBoxMainExe_LIBS = 7249 endif 7250 TEMPLATE_VBoxMainExe_LDFLAGS.solaris = -Wl,-z,ignore # Same as VBOX_LD_as_needed. 7251 7251 ifdef VBOX_WITH_RUNPATH 7252 TEMPLATE_VB OXMAINEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)'7252 TEMPLATE_VBoxMainExe_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' 7253 7253 else ifdef VBOX_WITH_RELATIVE_RUNPATH 7254 TEMPLATE_VB OXMAINEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'7254 TEMPLATE_VBoxMainExe_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)' 7255 7255 endif 7256 7256 ifdef VBOX_WITH_ORIGIN 7257 TEMPLATE_VB OXMAINEXE_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT)7257 TEMPLATE_VBoxMainExe_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT) 7258 7258 endif 7259 7259 … … 7261 7261 7262 7262 # Add COM/XPCOM stuff 7263 TEMPLATE_VB OXMAINEXE_LIBS += \7263 TEMPLATE_VBoxMainExe_LIBS += \ 7264 7264 $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) 7265 7265 ifdef VBOX_WITH_XPCOM 7266 7266 ## @todo may be worth creating the VBOX_XPCOM SDK def 7267 TEMPLATE_VB OXMAINEXE_DEFS += VBOX_WITH_XPCOM7267 TEMPLATE_VBoxMainExe_DEFS += VBOX_WITH_XPCOM 7268 7268 ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP 7269 TEMPLATE_VB OXMAINEXE_DEFS += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP7270 endif 7271 TEMPLATE_VB OXMAINEXE_INCS += \7269 TEMPLATE_VBoxMainExe_DEFS += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP 7270 endif 7271 TEMPLATE_VBoxMainExe_INCS += \ 7272 7272 $(VBOX_XPCOM_INCS) 7273 TEMPLATE_VB OXMAINEXE_LIBS += \7273 TEMPLATE_VBoxMainExe_LIBS += \ 7274 7274 $(LIB_XPCOM) 7275 TEMPLATE_VB OXMAINEXE_INTERMEDIATES += \7275 TEMPLATE_VBoxMainExe_INTERMEDIATES += \ 7276 7276 $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h 7277 7277 7278 7278 else # COM 7279 TEMPLATE_VB OXMAINEXE_INCS += \7279 TEMPLATE_VBoxMainExe_INCS += \ 7280 7280 $(VBOX_PATH_SDK)/bindings/mscom/include 7281 TEMPLATE_VB OXMAINEXE_INTERMEDIATES += \7281 TEMPLATE_VBoxMainExe_INTERMEDIATES += \ 7282 7282 $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h 7283 7283 endif # COM … … 7287 7287 # components for Main). 7288 7288 # 7289 # This differs from VB OXMAINEXEonly in PIC handling and similar DLL stuff.7289 # This differs from VBoxMainExe only in PIC handling and similar DLL stuff. 7290 7290 # 7291 7291 TEMPLATE_VBOXMAINDLL = VBox Main Component (shared library) 7292 TEMPLATE_VBOXMAINDLL_EXTENDS = VB OXMAINEXE7292 TEMPLATE_VBOXMAINDLL_EXTENDS = VBoxMainExe 7293 7293 ifn1of ($(KBUILD_TARGET), darwin haiku os2 win) 7294 TEMPLATE_VBOXMAINDLL_DEFS = PIC $(TEMPLATE_VB OXMAINEXE_DEFS)7295 TEMPLATE_VBOXMAINDLL_CFLAGS = -fPIC $(TEMPLATE_VB OXMAINEXE_CFLAGS)7296 TEMPLATE_VBOXMAINDLL_CXXFLAGS = -fPIC $(TEMPLATE_VB OXMAINEXE_CXXFLAGS)7297 TEMPLATE_VBOXMAINDLL_PCHFLAGS = -fPIC $(TEMPLATE_VB OXMAINEXE_PCHFLAGS)7298 TEMPLATE_VBOXMAINDLL_LDFLAGS = -fPIC $(TEMPLATE_VB OXMAINEXE_LDFLAGS)7299 endif 7300 TEMPLATE_VBOXMAINDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VB OXMAINEXE_LDFLAGS.darwin)) \7294 TEMPLATE_VBOXMAINDLL_DEFS = PIC $(TEMPLATE_VBoxMainExe_DEFS) 7295 TEMPLATE_VBOXMAINDLL_CFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_CFLAGS) 7296 TEMPLATE_VBOXMAINDLL_CXXFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_CXXFLAGS) 7297 TEMPLATE_VBOXMAINDLL_PCHFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_PCHFLAGS) 7298 TEMPLATE_VBOXMAINDLL_LDFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_LDFLAGS) 7299 endif 7300 TEMPLATE_VBOXMAINDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBoxMainExe_LDFLAGS.darwin)) \ 7301 7301 -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \ 7302 7302 -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) … … 7307 7307 # 7308 7308 # Note! In the hardened build this gets a bit ugly since $ORIGIN/.. 7309 # doesn't work. So, we keep the $ORIGIN from VB OXMAINEXEand let7309 # doesn't work. So, we keep the $ORIGIN from VBoxMainExe and let 7310 7310 # the installers do the necessary .so symlinking. 7311 7311 # … … 7313 7313 # 7314 7314 TEMPLATE_VBOXMAINCOMP = VBox Main COM/XPCOM Component (shared library) 7315 TEMPLATE_VBOXMAINCOMP_EXTENDS = VB OXMAINEXE7315 TEMPLATE_VBOXMAINCOMP_EXTENDS = VBoxMainExe 7316 7316 ifn1of ($(KBUILD_TARGET), win) 7317 7317 TEMPLATE_VBOXMAINCOMP_INST = $(INST_BIN)components/ … … 7319 7319 ifneq ($(KBUILD_TARGET),win) 7320 7320 ifeq ($(filter-out solaris.x86 %.amd64 %.sparc32 %.sparc64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) ## TODO: cleanup! 7321 TEMPLATE_VBOXMAINCOMP_DEFS = PIC $(TEMPLATE_VB OXMAINEXE_DEFS)7322 TEMPLATE_VBOXMAINCOMP_CFLAGS = -fPIC $(TEMPLATE_VB OXMAINEXE_CFLAGS)7323 TEMPLATE_VBOXMAINCOMP_CXXFLAGS = -fPIC $(TEMPLATE_VB OXMAINEXE_CXXFLAGS)7324 TEMPLATE_VBOXMAINCOMP_PCHFLAGS = -fPIC $(TEMPLATE_VB OXMAINEXE_PCHFLAGS)7321 TEMPLATE_VBOXMAINCOMP_DEFS = PIC $(TEMPLATE_VBoxMainExe_DEFS) 7322 TEMPLATE_VBOXMAINCOMP_CFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_CFLAGS) 7323 TEMPLATE_VBOXMAINCOMP_CXXFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_CXXFLAGS) 7324 TEMPLATE_VBOXMAINCOMP_PCHFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_PCHFLAGS) 7325 7325 if defined(VBOX_WITH_RELATIVE_RUNPATH) && !defined(VBOX_WITH_HARDENING) 7326 TEMPLATE_VBOXMAINCOMP_LDFLAGS = -fPIC $(filter-out '$(VBOX_GCC_RPATH_OPT)%',$(TEMPLATE_VB OXMAINEXE_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..'7326 TEMPLATE_VBOXMAINCOMP_LDFLAGS = -fPIC $(filter-out '$(VBOX_GCC_RPATH_OPT)%',$(TEMPLATE_VBoxMainExe_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' 7327 7327 else 7328 TEMPLATE_VBOXMAINCOMP_LDFLAGS = -fPIC $(TEMPLATE_VB OXMAINEXE_LDFLAGS)7328 TEMPLATE_VBOXMAINCOMP_LDFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_LDFLAGS) 7329 7329 endif 7330 7330 else ifndef VBOX_WITH_HARDENING 7331 7331 ifdef VBOX_WITH_RELATIVE_RUNPATH 7332 TEMPLATE_VBOXMAINCOMP_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%',$(TEMPLATE_VB OXMAINEXE_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..'7333 endif 7334 endif 7335 endif 7336 TEMPLATE_VBOXMAINCOMP_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VB OXMAINEXE_LDFLAGS.darwin)) \7332 TEMPLATE_VBOXMAINCOMP_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%',$(TEMPLATE_VBoxMainExe_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' 7333 endif 7334 endif 7335 endif 7336 TEMPLATE_VBOXMAINCOMP_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBoxMainExe_LDFLAGS.darwin)) \ 7337 7337 -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \ 7338 7338 -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) … … 7368 7368 # 7369 7369 # Main unit testing, for compiling API implementation files into a testcase. 7370 # This is the VB OXMAINEXEtemplate only with a different install dir.7370 # This is the VBoxMainExe template only with a different install dir. 7371 7371 # 7372 7372 TEMPLATE_VBOXMAINTSTEXE = VBox Main Testcase Exe 7373 TEMPLATE_VBOXMAINTSTEXE_EXTENDS = VB OXMAINEXE7373 TEMPLATE_VBOXMAINTSTEXE_EXTENDS = VBoxMainExe 7374 7374 TEMPLATE_VBOXMAINTSTEXE_INST = $(INST_TESTCASE) 7375 7375 ifdef VBOX_WITH_RUNPATH 7376 TEMPLATE_VBOXMAINTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_VB OXMAINEXE_LDFLAGS)7376 TEMPLATE_VBOXMAINTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_VBoxMainExe_LDFLAGS) 7377 7377 else ifdef VBOX_WITH_RELATIVE_RUNPATH 7378 TEMPLATE_VBOXMAINTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' $(TEMPLATE_VB OXMAINEXE_LDFLAGS)7378 TEMPLATE_VBOXMAINTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' $(TEMPLATE_VBoxMainExe_LDFLAGS) 7379 7379 endif 7380 7380 if "$(KBUILD_TARGET)" == "win" && defined(VBOX_SIGNING_MODE) … … 7386 7386 # 7387 7387 TEMPLATE_VBOXMAINCLIENTEXE = VBox Main Client (executable) 7388 TEMPLATE_VBOXMAINCLIENTEXE_EXTENDS = VB OXMAINEXE7388 TEMPLATE_VBOXMAINCLIENTEXE_EXTENDS = VBoxMainExe 7389 7389 ifeq ($(KBUILD_TARGET),win) 7390 7390 TEMPLATE_VBOXMAINCLIENTEXE_DEPS = $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h 7391 TEMPLATE_VBOXMAINCLIENTEXE_LIBS.win = $(TEMPLATE_VB OXMAINEXE_LIBS.win) \7391 TEMPLATE_VBOXMAINCLIENTEXE_LIBS.win = $(TEMPLATE_VBoxMainExe_LIBS.win) \ 7392 7392 $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/User32.Lib \ 7393 7393 $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Shell32.Lib \ … … 7398 7398 else 7399 7399 TEMPLATE_VBOXMAINCLIENTEXE_DEPS = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h 7400 TEMPLATE_VBOXMAINCLIENTEXE_DEFS = $(TEMPLATE_VB OXMAINEXE_DEFS) \7400 TEMPLATE_VBOXMAINCLIENTEXE_DEFS = $(TEMPLATE_VBoxMainExe_DEFS) \ 7401 7401 NDEBUG TRIMMED 7402 TEMPLATE_VBOXMAINCLIENTEXE_CXXFLAGS.linux = $(TEMPLATE_VB OXMAINEXE_CXXFLAGS.linux) -pthread7403 TEMPLATE_VBOXMAINCLIENTEXE_PCHFLAGS.linux = $(TEMPLATE_VB OXMAINEXE_PCHFLAGS.linux) -pthread7402 TEMPLATE_VBOXMAINCLIENTEXE_CXXFLAGS.linux = $(TEMPLATE_VBoxMainExe_CXXFLAGS.linux) -pthread 7403 TEMPLATE_VBOXMAINCLIENTEXE_PCHFLAGS.linux = $(TEMPLATE_VBoxMainExe_PCHFLAGS.linux) -pthread 7404 7404 endif 7405 7405 -
trunk/include/Makefile.kmk
r98128 r98183 206 206 207 207 if1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUPPORTED_HOST_ARCHS)) 208 SyntaxVBoxIncludeR3_TEMPLATE = VB OXMAINEXE208 SyntaxVBoxIncludeR3_TEMPLATE = VBoxMainExe 209 209 SyntaxVBoxIncludeR3_DEFS = VBOX_WITH_HGCM 210 210 else -
trunk/src/VBox/Main/Makefile.kmk
r98127 r98183 464 464 if defined(VBOX_WITH_SDS) && "$(KBUILD_TARGET)" == "win" 465 465 PROGRAMS.win += VBoxSDS 466 VBoxSDS_TEMPLATE = VB OXMAINEXE466 VBoxSDS_TEMPLATE = VBoxMainExe 467 467 VBoxSDS_DEFS += VBOX_COM_OUTOFPROC_MODULE _WIN32_WINNT=0x0600 468 468 ifdef VBOX_WITH_VBOXSDL … … 516 516 # 517 517 PROGRAMS += VBoxSVC 518 VBoxSVC_TEMPLATE = VB OXMAINEXE518 VBoxSVC_TEMPLATE = VBoxMainExe 519 519 if defined(VBOX_WITH_PRECOMPILED_HEADERS) && "$(KBUILD_TARGET)" == "win" 520 520 VBoxSVC_USES += vccprecomp -
trunk/src/VBox/Main/cbinding/Makefile.kmk
r98169 r98183 107 107 # 108 108 LIBRARIES += VBoxCAPIGlue 109 VBoxCAPIGlue_TEMPLATE = VB OXMAINEXE109 VBoxCAPIGlue_TEMPLATE = VBoxMainExe 110 110 VBoxCAPIGlue_DEFS = IN_VBOXCAPI 111 111 VBoxCAPIGlue_SOURCES = \ -
trunk/src/VBox/Main/src-helper-apps/OpenGLTest/Makefile.kmk
r98133 r98183 62 62 endif 63 63 PROGRAMS += VBoxTestOGL 64 VBoxTestOGL_TEMPLATE = $(if $(VBOX_WITH_VIDEOHWACCEL),$(if $(VBOX_WITH_HARDENING),VBoxQtGuiDll,VBoxQtGuiExe),VB OXMAINEXE)64 VBoxTestOGL_TEMPLATE = $(if $(VBOX_WITH_VIDEOHWACCEL),$(if $(VBOX_WITH_HARDENING),VBoxQtGuiDll,VBoxQtGuiExe),VBoxMainExe) 65 65 VBoxTestOGL_DEFS.win = _WIN32_WINNT=0x0500 WINDOWS=1 66 66 VBoxTestOGL_DEFS.linux = Linux=1 _GNU_SOURCE
Note:
See TracChangeset
for help on using the changeset viewer.

