Changeset 5359 in vbox for trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk

Timestamp:

Oct 17, 2007 3:19:01 PM (17 years ago)

Author:

vboxsync

Message:

Solaris: LIB_XCURSOR -> VBOX_XCURSOR_LIBS/INCS. Qt in tools (solaris only).

File:

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

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

@@ -37 +37 @@
         win32/VBoxSDL.rc
 endif
+
 VBoxSDL_DEFS       =
 ifdef VBOX_WITH_SECURELABEL
@@ -56 +57 @@
 VBoxSDL_DEFS.win.x86 = _WIN32_WINNT=0x0500
 VBoxSDL_DEFS.win.amd64 = _WIN32_WINNT=0x0510
+
 VBoxSDL_INCS = \
         $(PATH_BIN)/sdk/include \
         $(PATH_VBoxSDL)
+ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
+VBoxSDL_INCS += \
+        $(VBOX_XCURSOR_INCS)
+endif
+VBoxSDL_INCS.freebsd = \
+        /usr/include \
+        /usr/local/include \
+        /usr/X11R6/include ## @todo figure this out.
 ifneq ($(filter-out win solaris,$(BUILD_TARGET)),)
+
 VBoxSDL_LIBS = \
         $(LIB_SDK_LIBSDL_SDLMAIN)
 endif
 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
-ifneq ($(BUILD_TARGET),solaris) ## @todo Xcursor on solaris.
 VBoxSDL_LIBS += \
-        $(LIB_XCURSOR)
-endif
+        $(VBOX_XCURSOR_LIBS)
 VBoxSDL_LIBPATH = \
         $(VBOX_LIBPATH_X11)
-VBoxSDL_INCS.freebsd = \
-        /usr/include \
-        /usr/local/include \
-        /usr/X11R6/include ## @todo figure this out.
 endif
 VBoxSDL_LIBS.solaris = \
@@ -80 +85 @@
  #VBoxSDL_LIBS.linux += GL
 endif
+
 VBoxSDL_LDFLAGS.darwin = \
         -framework Foundation -framework AppKit