Changeset 3188 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Jun 20, 2007 5:24:15 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22127

Message:

Build: Renamed VBox COM Glue library from VBoxXPCOM.[a|lib] to VBoxCOM.[a|lib] (to match one on Win32 and to remove name ambiguity caused by VBoxXPCOM.[so|dll]).

File:

• trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk

@@ -29 +29 @@
 # VBoxSDL
 #
-ifneq ($(filter win linux,$(BUILD_TARGET)),)    ## @todo Convert these two to the other template too!
- VBoxSDL_TEMPLATE  = VBOXR3NPEXE
- VBoxSDL_CXXFLAGS.win = \
-        -EHsc
- VBoxSDL_CXXFLAGS.linux = \
-        -DNDEBUG -DTRIMMED -DVBOX_WITH_XPCOM -O -Wall -fno-rtti -fno-exceptions \
-        -Wno-non-virtual-dtor -Wno-long-long -fshort-wchar -pthread -pipe
-else
- VBoxSDL_TEMPLATE  = VBOXMAINCLIENTEXE
-endif
+
+VBoxSDL_TEMPLATE   = VBOXMAINCLIENTEXE
 VBoxSDL_SDKS       = LIBSDL
 VBoxSDL_SOURCES    = \
@@ -67 +59 @@
 VBoxSDL_DEFS.win.amd64 = _WIN32_WINNT=0x0510
 VBoxSDL_INCS = \
-        $(PATH_BIN)/sdk/include
-ifdef VBOX_WITH_XPCOM
- VBoxSDL_INCS = \
         $(PATH_BIN)/sdk/include \
-        $(VBOX_XPCOM_INCS) \
         $(PATH_VBoxSDL)
- VBoxSDL_LIBS = \
-    $(LIB_SDK_LIBSDL_SDLMAIN) \
-        $(PATH_LIB)/VBoxXPCOM$(VBOX_SUFF_LIB) \
-        $(LIB_RUNTIME) \
-        $(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB) \
-        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
- VBoxSDL_LIBS.linux = \
+VBoxSDL_LIBS.linux = \
         $(LIB_XCURSOR)
- VBoxSDL_LDFLAGS.darwin = \
-    -framework Foundation -framework AppKit
-else # !VBOX_WITH_XPCOM
- VBoxSDL_INCS.win = \
-        $(PATH_BIN)/sdk/include \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC) \
-        $(PATH_VBoxSDL)
- VBoxSDL_LIBS.win = \
-        $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls.lib \
-        $(LIB_RUNTIME)
-endif # !VBOX_WITH_XPCOM
+VBoxSDL_LDFLAGS.darwin = \
+        -framework Foundation -framework AppKit
 ifdef VBOX_OPENGL
  #VBoxSDL_LIBS.linux += GL