[Orxonox-commit 5564] r10227 - in code/branches/minigame4DHS14/src/modules: . mini4dgame

[landauf at orxonox.net]

Author: landauf
Date: 2015-02-01 14:25:02 +0100 (Sun, 01 Feb 2015)
New Revision: 10227

Modified:
   code/branches/minigame4DHS14/src/modules/CMakeLists.txt
   code/branches/minigame4DHS14/src/modules/mini4dgame/CMakeLists.txt
   code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.h
   code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameAI.h
   code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.h
   code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgamePrereqs.h
Log:
changed paths & fixed macro in Mini4DgamePrereqs.h

Modified: code/branches/minigame4DHS14/src/modules/CMakeLists.txt
===================================================================
--- code/branches/minigame4DHS14/src/modules/CMakeLists.txt	2015-02-01 13:23:41 UTC (rev 10226)
+++ code/branches/minigame4DHS14/src/modules/CMakeLists.txt	2015-02-01 13:25:02 UTC (rev 10227)
@@ -39,4 +39,4 @@
 ADD_SUBDIRECTORY(docking)
 ADD_SUBDIRECTORY(towerdefense)
 ADD_SUBDIRECTORY(invader)
-ADD_SUBDIRECTORY(mini4Dgame)
+ADD_SUBDIRECTORY(mini4dgame)

Modified: code/branches/minigame4DHS14/src/modules/mini4dgame/CMakeLists.txt
===================================================================
--- code/branches/minigame4DHS14/src/modules/mini4dgame/CMakeLists.txt	2015-02-01 13:23:41 UTC (rev 10226)
+++ code/branches/minigame4DHS14/src/modules/mini4dgame/CMakeLists.txt	2015-02-01 13:25:02 UTC (rev 10227)
@@ -4,7 +4,7 @@
   Mini4DgameBoard.cc
 )
 
-ORXONOX_ADD_LIBRARY(mini4Dgame
+ORXONOX_ADD_LIBRARY(mini4dgame
   MODULE
   FIND_HEADER_FILES
   LINK_LIBRARIES

Modified: code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.h
===================================================================
--- code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.h	2015-02-01 13:23:41 UTC (rev 10226)
+++ code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.h	2015-02-01 13:25:02 UTC (rev 10227)
@@ -35,7 +35,7 @@
 #define _Mini4Dgame_H__
 
 #include "gametypes/Deathmatch.h"
-#include "mini4Dgame/Mini4DgamePrereqs.h"
+#include "mini4dgame/Mini4DgamePrereqs.h"
 #include "Mini4DgameBoard.h"
 
 namespace orxonox

Modified: code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameAI.h
===================================================================
--- code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameAI.h	2015-02-01 13:23:41 UTC (rev 10226)
+++ code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameAI.h	2015-02-01 13:25:02 UTC (rev 10227)
@@ -34,7 +34,7 @@
 #ifndef _Mini4DgameAI_H__
 #define _Mini4DgameAI_H__
 
-#include "mini4Dgame/Mini4DgamePrereqs.h"
+#include "mini4dgame/Mini4DgamePrereqs.h"
 
 #include <list>
 

Modified: code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.h
===================================================================
--- code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.h	2015-02-01 13:23:41 UTC (rev 10226)
+++ code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.h	2015-02-01 13:25:02 UTC (rev 10227)
@@ -35,7 +35,7 @@
 #ifndef _Mini4DgameBoard_H__
 #define _Mini4DgameBoard_H__
 
-#include "mini4Dgame/Mini4DgamePrereqs.h"
+#include "mini4dgame/Mini4DgamePrereqs.h"
 
 #include "worldentities/StaticEntity.h"
 

Modified: code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgamePrereqs.h
===================================================================
--- code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgamePrereqs.h	2015-02-01 13:23:41 UTC (rev 10226)
+++ code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgamePrereqs.h	2015-02-01 13:25:02 UTC (rev 10227)
@@ -42,8 +42,8 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Mini4Dgame_STATIC_BUILD)
-#  ifdef Mini4Dgame_SHARED_BUILD
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(MINI4DGAME_STATIC_BUILD)
+#  ifdef MINI4DGAME_SHARED_BUILD
 #    define _Mini4DgameExport __declspec(dllexport)
 #  else
 #    if defined( __MINGW32__ )