[Orxonox-commit 2427] r7136 - in code/branches/presentation3/src: libraries/tools modules/designtools modules/objects modules/overlays modules/pickup modules/pong modules/questsystem modules/weapons

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-06-10 00:55:47 +0200 (Thu, 10 Jun 2010)
New Revision: 7136

Modified:
   code/branches/presentation3/src/libraries/tools/ToolsPrereqs.h
   code/branches/presentation3/src/modules/designtools/DesignToolsPrereqs.h
   code/branches/presentation3/src/modules/objects/ObjectsPrereqs.h
   code/branches/presentation3/src/modules/overlays/OverlaysPrereqs.h
   code/branches/presentation3/src/modules/pickup/PickupPrereqs.h
   code/branches/presentation3/src/modules/pong/PongPrereqs.h
   code/branches/presentation3/src/modules/questsystem/QuestsystemPrereqs.h
   code/branches/presentation3/src/modules/weapons/WeaponsPrereqs.h
Log:
Some libraries/modules were still using ORXONOX_STATIC_BUILD, which is only intended for the orxonox library.

Modified: code/branches/presentation3/src/libraries/tools/ToolsPrereqs.h
===================================================================
--- code/branches/presentation3/src/libraries/tools/ToolsPrereqs.h	2010-06-09 22:04:41 UTC (rev 7135)
+++ code/branches/presentation3/src/libraries/tools/ToolsPrereqs.h	2010-06-09 22:55:47 UTC (rev 7136)
@@ -41,7 +41,7 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(TOOLS_STATIC_BUILD)
 #  ifdef TOOLS_SHARED_BUILD
 #    define _ToolsExport __declspec(dllexport)
 #  else

Modified: code/branches/presentation3/src/modules/designtools/DesignToolsPrereqs.h
===================================================================
--- code/branches/presentation3/src/modules/designtools/DesignToolsPrereqs.h	2010-06-09 22:04:41 UTC (rev 7135)
+++ code/branches/presentation3/src/modules/designtools/DesignToolsPrereqs.h	2010-06-09 22:55:47 UTC (rev 7136)
@@ -42,7 +42,7 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(DESIGNTOOLS_STATIC_BUILD)
 #  ifdef DESIGNTOOLS_SHARED_BUILD
 #    define _DesignToolsExport __declspec(dllexport)
 #  else

Modified: code/branches/presentation3/src/modules/objects/ObjectsPrereqs.h
===================================================================
--- code/branches/presentation3/src/modules/objects/ObjectsPrereqs.h	2010-06-09 22:04:41 UTC (rev 7135)
+++ code/branches/presentation3/src/modules/objects/ObjectsPrereqs.h	2010-06-09 22:55:47 UTC (rev 7136)
@@ -42,7 +42,7 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(OBJECTS_STATIC_BUILD)
 #  ifdef OBJECTS_SHARED_BUILD
 #    define _ObjectsExport __declspec(dllexport)
 #  else

Modified: code/branches/presentation3/src/modules/overlays/OverlaysPrereqs.h
===================================================================
--- code/branches/presentation3/src/modules/overlays/OverlaysPrereqs.h	2010-06-09 22:04:41 UTC (rev 7135)
+++ code/branches/presentation3/src/modules/overlays/OverlaysPrereqs.h	2010-06-09 22:55:47 UTC (rev 7136)
@@ -42,7 +42,7 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(OVERLAYS_STATIC_BUILD)
 #  ifdef OVERLAYS_SHARED_BUILD
 #    define _OverlaysExport __declspec(dllexport)
 #  else

Modified: code/branches/presentation3/src/modules/pickup/PickupPrereqs.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/PickupPrereqs.h	2010-06-09 22:04:41 UTC (rev 7135)
+++ code/branches/presentation3/src/modules/pickup/PickupPrereqs.h	2010-06-09 22:55:47 UTC (rev 7136)
@@ -42,7 +42,7 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(PICKUP_STATIC_BUILD)
 #  ifdef PICKUP_SHARED_BUILD
 #    define _PickupExport __declspec(dllexport)
 #  else

Modified: code/branches/presentation3/src/modules/pong/PongPrereqs.h
===================================================================
--- code/branches/presentation3/src/modules/pong/PongPrereqs.h	2010-06-09 22:04:41 UTC (rev 7135)
+++ code/branches/presentation3/src/modules/pong/PongPrereqs.h	2010-06-09 22:55:47 UTC (rev 7136)
@@ -42,7 +42,7 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(PONG_STATIC_BUILD)
 #  ifdef PONG_SHARED_BUILD
 #    define _PongExport __declspec(dllexport)
 #  else

Modified: code/branches/presentation3/src/modules/questsystem/QuestsystemPrereqs.h
===================================================================
--- code/branches/presentation3/src/modules/questsystem/QuestsystemPrereqs.h	2010-06-09 22:04:41 UTC (rev 7135)
+++ code/branches/presentation3/src/modules/questsystem/QuestsystemPrereqs.h	2010-06-09 22:55:47 UTC (rev 7136)
@@ -42,7 +42,7 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(QUESTSYSTEM_STATIC_BUILD)
 #  ifdef QUESTSYSTEM_SHARED_BUILD
 #    define _QuestsystemExport __declspec(dllexport)
 #  else

Modified: code/branches/presentation3/src/modules/weapons/WeaponsPrereqs.h
===================================================================
--- code/branches/presentation3/src/modules/weapons/WeaponsPrereqs.h	2010-06-09 22:04:41 UTC (rev 7135)
+++ code/branches/presentation3/src/modules/weapons/WeaponsPrereqs.h	2010-06-09 22:55:47 UTC (rev 7136)
@@ -42,7 +42,7 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(WEAPONS_STATIC_BUILD)
 #  ifdef WEAPONS_SHARED_BUILD
 #    define _WeaponsExport __declspec(dllexport)
 #  else