Changeset 10221 for code/branches/presentationHS14

Timestamp:

Feb 1, 2015, 1:39:16 PM (10 years ago)

Author:

landauf

Message:

renamed module: dodgerace2 → dodgerace (this also fixes build on MSVC because of inconsistent macro definition in DodgeRacePrereqs.h)

Location:

code/branches/presentationHS14/src/modules

Files:

• CMakeLists.txt (modified) (1 diff)
• dodgerace (moved) (moved from code/branches/presentationHS14/src/modules/dodgerace2)
• dodgerace/CMakeLists.txt (modified) (3 diffs)
• dodgerace/DodgeRace.cc (copied) (copied from code/branches/presentationHS14/src/modules/dodgerace2/DodgeRace.cc)
• dodgerace/DodgeRace.h (modified) (1 diff)
• dodgerace/DodgeRaceCenterPoint.h (modified) (1 diff)
• dodgerace/DodgeRaceCube.h (modified) (1 diff)
• dodgerace/DodgeRaceHUDinfo.h (modified) (1 diff)
• dodgerace/DodgeRaceShip.h (modified) (1 diff)

code/branches/presentationHS14/src/modules/CMakeLists.txt

@@ -41 +41 @@
 ADD_SUBDIRECTORY(invader)
 ADD_SUBDIRECTORY(mini4Dgame)
-ADD_SUBDIRECTORY(dodgerace2)
+ADD_SUBDIRECTORY(dodgerace)

code/branches/presentationHS14/src/modules/dodgerace/CMakeLists.txt

@@ -1 @@
-SET_SOURCE_FILES(Dodgerace2_SRC_FILES
+SET_SOURCE_FILES(Dodgerace_SRC_FILES
 DodgeRace.cc
 DodgeRaceCenterPoint.cc
@@ -7 +7 @@
 )
 
-ORXONOX_ADD_LIBRARY(dodgerace2
+ORXONOX_ADD_LIBRARY(dodgerace
   MODULE
   FIND_HEADER_FILES
@@ -14 +14 @@
     overlays
     weapons
-  SOURCE_FILES ${Dodgerace2_SRC_FILES}
+  SOURCE_FILES ${Dodgerace_SRC_FILES}
 )

code/branches/presentationHS14/src/modules/dodgerace/DodgeRace.h

@@ -36 +36 @@
 #define _DodgeRace_H__
 
-#include "dodgerace2/DodgeRacePrereqs.h"
+#include "dodgerace/DodgeRacePrereqs.h"
 
 #include "DodgeRaceCenterPoint.h" // Necessary for WeakPointer??

code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceCenterPoint.h

@@ -36 +36 @@
 #define _DodgeRaceCenterPoint_H__
 
-#include "dodgerace2/DodgeRacePrereqs.h"
+#include "dodgerace/DodgeRacePrereqs.h"
 
 //#include "DodgeRace.h"

code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceCube.h

@@ -36 +36 @@
 #define _DodgeRaceCube_H__
 
-#include "dodgerace2/DodgeRacePrereqs.h"
+#include "dodgerace/DodgeRacePrereqs.h"
 
 #include "worldentities/MovableEntity.h"

code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceHUDinfo.h

@@ -32 +32 @@
 //#include "DodgeRaceCenterPoint.h"
 
-#include "dodgerace2/DodgeRacePrereqs.h"
+#include "dodgerace/DodgeRacePrereqs.h"
 
 #include "tools/interfaces/Tickable.h"

code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceShip.h

@@ -36 +36 @@
 
 
-#include "dodgerace2/DodgeRacePrereqs.h"
+#include "dodgerace/DodgeRacePrereqs.h"
 
 #include "core/CoreIncludes.h"