Changeset 24577 in vbox

Timestamp:

Nov 11, 2009 10:31:52 AM (15 years ago)

Author:

vboxsync

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

54708

Message:

Main,VMM,VBox/cdefs.h: build fix; added IN_VMM_STATIC.

Location:

trunk

Files:

• include/VBox/cdefs.h (modified) (4 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/VMM/Makefile.kmk (modified) (1 diff)

trunk/include/VBox/cdefs.h

@@ -179 +179 @@
 
 /** @def IN_SUP_R0
- * Used to indicate whether we're inside the same link module as the Ring 0 Support Library or not.
+ * Used to indicate whether we're inside the same link module as the Ring 0
+ * Support Library or not.
+ */
+/** @def IN_SUP_STATIC
+ * Used to indicate that the Support Library is built or used as a static
+ * library.
  */
 /** @def SUPR0DECL(type)
@@ -244 +249 @@
 
 
+/** @def IN_VMM_STATIC
+ * Used to indicate that the virtual machine monitor is built or used as a
+ * static library.
+ */
 /** @def IN_VMM_R3
  * Used to indicate whether we're inside the same link module as the ring 3 part of the
@@ -253 +262 @@
  */
 #ifdef IN_VMM_R3
-# define VMMR3DECL(type)            DECLEXPORT(type) VBOXCALL
+# ifdef IN_VMM_STATIC
+#  define VMMR3DECL(type)           DECLHIDDEN(type) VBOXCALL
+# else
+#  define VMMR3DECL(type)           DECLEXPORT(type) VBOXCALL
+# endif
 #elif defined(IN_RING3)
-# define VMMR3DECL(type)            DECLIMPORT(type) VBOXCALL
+# ifdef IN_VMM_STATIC
+#  define VMMR3DECL(type)           DECLHIDDEN(type) VBOXCALL
+# else
+#  define VMMR3DECL(type)           DECLIMPORT(type) VBOXCALL
+# endif
 #else
 # define VMMR3DECL(type)            DECL_INVALID(type)
@@ -308 +325 @@
  * @param   type    The return type of the function declaration.
  */
-#if defined(IN_VMM_R3) || defined(IN_VMM_R0) || defined(IN_VMM_RC)
+#ifdef IN_VMM_STATIC
+# define VMMDECL(type)              DECLHIDDEN(type) VBOXCALL
+#elif defined(IN_VMM_R3) || defined(IN_VMM_R0) || defined(IN_VMM_RC)
 # define VMMDECL(type)              DECLEXPORT(type) VBOXCALL
 #else

trunk/src/VBox/Main/Makefile.kmk

@@ -198 +198 @@
 VBoxSVC_DEFS = \
         VBOX_MAIN_SETTINGS_ADDONS \
+        IN_VMM_STATIC \
         $(VBOX_MAIN_DEFS) \
         $(if $(VBOX_WITH_VBOXSDL),VBOX_WITH_VBOXSDL,) \

trunk/src/VBox/VMM/Makefile.kmk

@@ -237 +237 @@
 LIBRARIES += SSMStandalone
 SSMStandalone_TEMPLATE  = VBOXR3EXE
-SSMStandalone_DEFS      = IN_VMM_R3 SSM_STANDALONE
+SSMStandalone_DEFS      = IN_VMM_R3 IN_VMM_STATIC SSM_STANDALONE
 SSMStandalone_SOURCES   = SSM.cpp