Changeset 4875 in vbox for trunk/src

Timestamp:

Sep 17, 2007 9:15:41 PM (17 years ago)

Author:

vboxsync

Message:

Made it compile on solaris.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (8 diffs)
• include/XKeyboard.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (2 diffs)
• ui/VBoxNewHDWzd.ui.h (modified) (1 diff)

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

@@ -35 +35 @@
 include $(PATH_KBUILD)/header.kmk
 
+
+#
+# The targets.
+#
 PROGRAMS = VirtualBox
-DLLS.linux = VBoxKeyboard
-
+ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(BUILD_TARGET)),) # X11
+DLLS = VBoxKeyboard
+endif
 INSTALLS = VirtualBox.nls
 
+
+#
+# VBoxKeyboard - keyboard library for X11.
+#
 VBoxKeyboard_TEMPLATE = VBOXR3
 VBoxKeyboard_SOURCES  = \
         src/linux/keyboard.c
 
+
+#
+# VirtualBox - The GUI program.
+#
 VirtualBox_TEMPLATE = VBOXQTGUIEXE
 VirtualBox_SDKS.win = WINPSDK DXSDK
-VirtualBox_SDKS.linux = LIBSDL
-VirtualBox_SDKS.os2 = LIBSDL
+#ifeq ($(filter-out freebsd linux netbsd openbsd os2 solaris,$(BUILD_TARGET)),) - later
+ifeq ($(filter-out freebsd linux netbsd openbsd os2,$(BUILD_TARGET)),)
+VirtualBox_SDKS += LIBSDL
+endif
 
 ifeq ($(BUILD_TARGET),darwin)
@@ -90 +105 @@
 # Sources containing local definitions of classes that use the Q_OBJECT macro
 VirtualBox_QT_MOCSRCS = src/VBoxSelectorWnd.cpp
-ifeq ($(BUILD_TARGET),linux)
+ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
 VirtualBox_QT_MOCSRCS += src/VBoxGlobal.cpp
 endif
@@ -152 +167 @@
         src/HappyHttp.cpp
 
+ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
+VirtualBox_SOURCES += \
+        src/linux/XKeyboard.cpp
+endif
+
 VirtualBox_SOURCES.win += \
         src/win32/VirtualBox.rc
@@ -157 +177 @@
 VirtualBox_SOURCES.win += \
         src/VBoxFBDDRAW.cpp
-
-VirtualBox_SOURCES.linux = \
-        src/linux/XKeyboard.cpp
 
 VirtualBox_SOURCES.darwin = \
@@ -167 +184 @@
         src/darwin/VBoxUtils-darwin.cpp
 
-src/HappyHttp.cpp_CXXFLAGS.linux += -fexceptions -O2
-src/HappyHttp.cpp_CXXFLAGS.darwin += -fexceptions
-src/HappyHttp.cpp_CXXFLAGS.os2 += -fexceptions
-src/VBoxDownloaderWgt.cpp_CXXFLAGS.linux += -fexceptions
-src/VBoxDownloaderWgt.cpp_CXXFLAGS.darwin += -fexceptions
-src/VBoxDownloaderWgt.cpp_CXXFLAGS.os2 += -fexceptions
+ifneq ($(BUILD_TARGET),win)
+src/HappyHttp.cpp_CXXFLAGS += -fexceptions
+src/VBoxDownloaderWgt.cpp_CXXFLAGS += -fexceptions
+endif
+src/HappyHttp.cpp_CXXFLAGS.linux += -O2
 
 ## @todo how to detect what tool is used?
@@ -184 +200 @@
 VirtualBox_DEFS.debug     = VBOX_GUI_DEBUG VBOX_CHECK_STATE # QT_FATAL_ASSERT
 VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_QHTTP
+VirtualBox_DEFS.freebsd   = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
 VirtualBox_DEFS.linux     = VBOX_GUI_USE_SDL
+VirtualBox_DEFS.netbsd    = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
+VirtualBox_DEFS.openbsd   = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
+VirtualBox_DEFS.os2       = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL QT_DLL
+VirtualBox_DEFS.solaris   = VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_XCURSOR #VBOX_GUI_USE_SDL
 VirtualBox_DEFS.win       = VBOX_GUI_USE_QIMAGE UNICODE QT_DLL
 VirtualBox_DEFS.win.amd64 = VBOX_WITHOUT_QHTTP
-VirtualBox_DEFS.os2       = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL QT_DLL
 #ifndef VBOX_OSE
  VirtualBox_DEFS.darwin  += VBOX_WITH_HACKED_QT
@@ -229 +249 @@
         $(PATH_SDK_DXSDK_LIB)/ddraw.lib \
         $(PATH_SDK_DXSDK_LIB)/dxguid.lib
-VirtualBox_LIBS.linux     = $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
-
-
-ifdef VBOX_WITH_DEBUGGER_GUI
+ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
+VirtualBox_LIBS          += $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
+endif
+
+
+ifdef VBOX_WITH_DEBUGGER_GUI ## @todo make this dynamically loadable and ship with release builds too.
  ifeq ($(BUILD_TARGET),win)
   VirtualBox_LIBS        += $(PATH_LIB)/VBoxDbg$(VBOX_SUFF_LIB)
@@ -297 +319 @@
 # Translation installation
 #
-
 VirtualBox.nls_INST = $(INST_BIN)nls/
 VirtualBox.nls_SOURCES =  $(patsubst %.ts,$(PATH_VirtualBox)/nls/%.qm,$(notdir $(VirtualBox_QT_TRANSLATIONS)))

trunk/src/VBox/Frontends/VirtualBox/include/XKeyboard.h

@@ -20 +20 @@
 #define __XKeyboard_h__
 
-#ifndef RT_OS_LINUX
-#error This file is X11/Linux specific!
-#endif
-
 // our structure used to return keyboard event information
 typedef struct _WINEKEYBOARDINFO

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -71 +71 @@
 #endif
 #include "XKeyboard.h"
-#include <X11/Xcursor/Xcursor.h>
-#endif
+#ifndef VBOX_WITHOUT_XCURSOR
+# include <X11/Xcursor/Xcursor.h>
+#endif
+#endif // Q_WS_X11
 
 #if defined (Q_WS_MAC)
@@ -2988 +2990 @@
             DeleteObject (hBitmap);
 
-#elif defined (Q_WS_X11)
+#elif defined (Q_WS_X11) && !defined (VBOX_WITHOUT_XCURSOR)
 
         XcursorImage *img = XcursorImageCreate (me->width(), me->height());

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxNewHDWzd.ui.h

@@ -317 +317 @@
     QString ext = QFileInfo (name).extension();
     /* compare against the proper case */
-#if defined (Q_OS_LINUX)
+#if defined (Q_OS_FREEBSD) || defined (Q_OS_LINUX) || defined (Q_OS_NETBSD) || defined (Q_OS_OPENBSD) || defined (Q_OS_SOLARIS)
 #elif defined (Q_OS_WIN) || defined (Q_OS_OS2) || defined (Q_OS_MACX)
     ext = ext.lower();