Changeset 98233 in vbox

Timestamp:

Jan 23, 2023 11:42:22 AM (2 years ago)

Author:

vboxsync

Message:

Main/webservices/Makefile.kmk: s/VBOXWEBR3EXE/VBoxWebR3Exe/ bugref:10348

File:

• trunk/src/VBox/Main/webservice/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Main/webservice/Makefile.kmk

@@ -217 +217 @@
 endif
 
-# disable -fvisibility=hidden as the SOAP stuff does not properly set the visibility attributes
-TEMPLATE_VBOXWEBR3EXE = Webservices without -fvisibility
-TEMPLATE_VBOXWEBR3EXE_EXTENDS = VBoxR3Exe
-TEMPLATE_VBOXWEBR3EXE_DEFS.win += WIN32_LEAN_AND_MEAN $(TEMPLATE_VBoxR3Exe_DEFS.win) # Makes the redefinition warnings go away.
-TEMPLATE_VBOXWEBR3EXE_CXXFLAGS = $(filter-out $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden),\
+#
+# Template that disables -fvisibility=hidden as the SOAP stuff does not
+# properly set the visibility attributes (or at least it didn't).
+#
+TEMPLATE_VBoxWebR3Exe = Webservices without -fvisibility=hidden
+TEMPLATE_VBoxWebR3Exe_EXTENDS = VBoxR3Exe
+TEMPLATE_VBoxWebR3Exe_DEFS.win += WIN32_LEAN_AND_MEAN $(TEMPLATE_VBoxR3Exe_DEFS.win) # Makes the redefinition warnings go away.
+TEMPLATE_VBoxWebR3Exe_CXXFLAGS = $(filter-out $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden),\
                                  $(TEMPLATE_VBoxR3Exe_CXXFLAGS))
 ifn1of ($(KBUILD_TARGET), win)
-TEMPLATE_VBOXWEBR3EXE_CXXFLAGS += $(VBOX_GCC_Wno-misleading-indentation)
+TEMPLATE_VBoxWebR3Exe_CXXFLAGS += $(VBOX_GCC_Wno-misleading-indentation)
 endif
 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
@@ -231 +234 @@
  # -wd5039: x509v3.h(883): warning C5039: 'OPENSSL_sk_set_cmp_func': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception.
  # soapc-1.cpp(182) : warning C4883: 'soap_getelement': function size suppresses optimizations
- TEMPLATE_VBOXWEBR3EXE_CXXFLAGS.win = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.win) -wd4774 -wd4458 -wd4883 -wd5039
-endif
+ TEMPLATE_VBoxWebR3Exe_CXXFLAGS.win = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.win) -wd4774 -wd4458 -wd4883 -wd5039
+endif
+
 
 ifdef VBOX_GSOAP_INSTALLED
@@ -247 +251 @@
   #
   LIBRARIES += vboxsoap
-  vboxsoap_TEMPLATE = VBOXWEBR3EXE
+  vboxsoap_TEMPLATE = VBoxWebR3Exe
   ifndef VBOX_WITHOUT_PRECOMPILED_HEADERS
    ifeq ($(KBUILD_TARGET),win)
@@ -575 +579 @@
  #
  PROGRAMS += webtest
- webtest_TEMPLATE = VBOXWEBR3EXE
+ webtest_TEMPLATE = VBoxWebR3Exe
  webtest_CXXFLAGS.win += -bigobj
  ifn1of ($(KBUILD_TARGET), win)