Rename common helium modules and directory for one

TheGreenBox · Sep 27, 2013 · 32ff4aa · 32ff4aa
1 parent a0ecd13
commit 32ff4aa
Show file tree

Hide file tree

Showing 38 changed files with 147 additions and 138 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,12 +13,12 @@ INCLUDE( heliumResourceIncludes )
 # -------------------------------------------------------------------
 # ------ modules building -------
 
-ADD_SUBDIRECTORY ( ${HELIUM_MODULES_DIR}/util                )
-ADD_SUBDIRECTORY ( ${HELIUM_MODULES_DIR}/userInput           )
-ADD_SUBDIRECTORY ( ${HELIUM_MODULES_DIR}/heliumSceneObjects  )
-ADD_SUBDIRECTORY ( ${HELIUM_MODULES_DIR}/heliumScreenObjects )
-ADD_SUBDIRECTORY ( ${HELIUM_MODULES_DIR}/heliumGameCore      )
-ADD_SUBDIRECTORY ( ${HELIUM_MODULES_DIR}/heliumMainMenu      )
+ADD_SUBDIRECTORY ( ${HELIUM_MODULES_DIR}/heliumUtil        )
+ADD_SUBDIRECTORY ( ${HELIUM_MODULES_DIR}/heliumUserInput   )
+ADD_SUBDIRECTORY ( ${HELIUM_MODULES_DIR}/helium_3D_Object  )
+ADD_SUBDIRECTORY ( ${HELIUM_MODULES_DIR}/helium_2D_Object  )
+ADD_SUBDIRECTORY ( ${HELIUM_MODULES_DIR}/heliumGameCore    )
+ADD_SUBDIRECTORY ( ${HELIUM_MODULES_DIR}/heliumMainMenu    )
 
 # -------------------------------------------------------------------
 

diff --git a/cmake/heliumIncludes.cmake b/cmake/heliumIncludes.cmake
@@ -53,10 +53,10 @@ ENDIF( )
 
 INCLUDE_DIRECTORIES ( ${HELIUM_MODULES_DIR}/heliumGameCore/include
                       ${HELIUM_MODULES_DIR}/heliumMainMenu/include
-                      ${HELIUM_MODULES_DIR}/heliumSceneObjects/include
-                      ${HELIUM_MODULES_DIR}/heliumScreenObjects/include
-                      ${HELIUM_MODULES_DIR}/util/include
-                      ${HELIUM_MODULES_DIR}/userInput/include
+                      ${HELIUM_MODULES_DIR}/helium_3D_Object/include
+                      ${HELIUM_MODULES_DIR}/helium_2D_Object/include
+                      ${HELIUM_MODULES_DIR}/heliumUtil/include
+                      ${HELIUM_MODULES_DIR}/heliumUserInput/include
                       ${POLYCODE_CORE_INCLUDE_DIR}
                       ${POLYCODE_MODULES_INCLUDE_DIR}
                       ${SDL_INCLUDE_DIR}
@@ -65,10 +65,10 @@ INCLUDE_DIRECTORIES ( ${HELIUM_MODULES_DIR}/heliumGameCore/include
 
 LINK_DIRECTORIES ( ${HELIUM_MODULES_DIR}/heliumGameCore )
 LINK_DIRECTORIES ( ${HELIUM_MODULES_DIR}/heliumMainMenu )
-LINK_DIRECTORIES ( ${HELIUM_MODULES_DIR}/heliumSceneObjects )
-LINK_DIRECTORIES ( ${HELIUM_MODULES_DIR}/heliumScreenObjects )
-LINK_DIRECTORIES ( ${HELIUM_MODULES_DIR}/util )
-LINK_DIRECTORIES ( ${HELIUM_MODULES_DIR}/userInput )
+LINK_DIRECTORIES ( ${HELIUM_MODULES_DIR}/helium_3D_Object )
+LINK_DIRECTORIES ( ${HELIUM_MODULES_DIR}/helium_2D_Object )
+LINK_DIRECTORIES ( ${HELIUM_MODULES_DIR}/heliumUtil )
+LINK_DIRECTORIES ( ${HELIUM_MODULES_DIR}/heliumUserInput )
 
 ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
 

diff --git a/modules/heliumGameCore/CMakeLists.txt b/modules/heliumGameCore/CMakeLists.txt
@@ -23,8 +23,8 @@ ADD_LIBRARY ( heliumGameCore STATIC
 
 TARGET_LINK_LIBRARIES ( heliumGameCore
                             ${LIB_POLYCODE}
-                            heliumSceneObjects
-                            heliumScreenObjects
+                            helium_2D_Object
+                            helium_3D_Object
                             heliumUserInput
                       )
 
diff --git a/modules/heliumSceneObjects/CMakeLists.txt b/modules/heliumSceneObjects/CMakeLists.txt
diff --git a/modules/heliumScreenObjects/CMakeLists.txt b/modules/heliumScreenObjects/CMakeLists.txt
diff --git a/modules/heliumUserInput/CMakeLists.txt b/modules/heliumUserInput/CMakeLists.txt
@@ -0,0 +1,33 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+MESSAGE( STATUS "HELIUM USER INPUT MODULE:" )
+
+PROJECT( heliumUserInput )
+
+INCLUDE( heliumIncludes )
+
+SET( HELIUM_USER_INPUT_PROJECT_DIR ${HELIUM_MODULES_DIR}/heliumUserInput )
+
+SET ( heliumUserInput_SRCS
+        ${HELIUM_USER_INPUT_PROJECT_DIR}/src/heliumPreparedKeyHandlers.cpp
+        ${HELIUM_USER_INPUT_PROJECT_DIR}/src/heliumInputDipather.cpp
+        ${HELIUM_USER_INPUT_PROJECT_DIR}/src/heliumPreparedMouseHandlers.cpp 
+    )
+
+SET ( heliumUserInput_HDRS
+        ${HELIUM_USER_INPUT_PROJECT_DIR}/include/heliumPreparedKeyHandlers.h
+        ${HELIUM_USER_INPUT_PROJECT_DIR}/include/heliumInputDipather.h
+        ${HELIUM_USER_INPUT_PROJECT_DIR}/include/heliumUserInputHandler.h
+        ${HELIUM_USER_INPUT_PROJECT_DIR}/include/heliumPreparedMouseHandlers.h
+    ) 
+
+ADD_LIBRARY ( heliumUserInput STATIC
+                ${heliumUserInput_SRCS}
+                ${heliumUserInput_HDRS} 
+            )
+
+TARGET_LINK_LIBRARIES ( heliumUserInput
+                            ${LIB_POLYCODE}
+                            helium_2D_Object
+                      )
+
diff --git a/...s/userInput/include/heliumInputDipather.h → ...umUserInput/include/heliumInputDipather.h b/...s/userInput/include/heliumInputDipather.h → ...umUserInput/include/heliumInputDipather.h
diff --git a/...Input/include/heliumPreparedKeyHandlers.h → ...Input/include/heliumPreparedKeyHandlers.h b/...Input/include/heliumPreparedKeyHandlers.h → ...Input/include/heliumPreparedKeyHandlers.h
diff --git a/...put/include/heliumPreparedMouseHandlers.h → ...put/include/heliumPreparedMouseHandlers.h b/...put/include/heliumPreparedMouseHandlers.h → ...put/include/heliumPreparedMouseHandlers.h
diff --git a/modules/userInput/include/heliumUserInput.h → ...heliumUserInput/include/heliumUserInput.h b/modules/userInput/include/heliumUserInput.h → ...heliumUserInput/include/heliumUserInput.h
diff --git a/...serInput/include/heliumUserInputHandler.h → ...serInput/include/heliumUserInputHandler.h b/...serInput/include/heliumUserInputHandler.h → ...serInput/include/heliumUserInputHandler.h
diff --git a/...les/userInput/src/heliumInputDipather.cpp → ...liumUserInput/src/heliumInputDipather.cpp b/...les/userInput/src/heliumInputDipather.cpp → ...liumUserInput/src/heliumInputDipather.cpp
diff --git a/...erInput/src/heliumPreparedKeyHandlers.cpp → ...erInput/src/heliumPreparedKeyHandlers.cpp b/...erInput/src/heliumPreparedKeyHandlers.cpp → ...erInput/src/heliumPreparedKeyHandlers.cpp
diff --git a/...Input/src/heliumPreparedMouseHandlers.cpp → ...Input/src/heliumPreparedMouseHandlers.cpp b/...Input/src/heliumPreparedMouseHandlers.cpp → ...Input/src/heliumPreparedMouseHandlers.cpp
diff --git a/modules/heliumUtil/CMakeLists.txt b/modules/heliumUtil/CMakeLists.txt
@@ -0,0 +1,26 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+MESSAGE(STATUS "MODULE: << heliumUtil >>")
+
+PROJECT( heliumUtil )
+
+INCLUDE( heliumIncludes )
+
+SET( HELIUM_UTIL_PROJECT_DIR ${HELIUM_MODULES_DIR}/heliumUtil )
+
+SET ( heliumGameCore_SRCS
+        ${HELIUM_UTIL_PROJECT_DIR}/src/pathGlobal.cpp
+        ${HELIUM_UTIL_PROJECT_DIR}/src/debugTools.cpp
+    )
+
+SET ( heliumGameCore_HDRS
+        ${HELIUM_UTIL_PROJECT_DIR}/include/pathGlobal.h
+        ${HELIUM_UTIL_PROJECT_DIR}/include/mainMacro.h
+        ${HELIUM_UTIL_PROJECT_DIR}/include/debugTools.h
+    )
+
+ADD_LIBRARY ( heliumUtil STATIC
+                ${heliumGameCore_SRCS}
+                ${heliumGameCore_HDRS}
+            )
+
diff --git a/modules/util/include/debugTools.h → modules/heliumUtil/include/debugTools.h b/modules/util/include/debugTools.h → modules/heliumUtil/include/debugTools.h
diff --git a/modules/util/include/mainMacro.h → modules/heliumUtil/include/mainMacro.h b/modules/util/include/mainMacro.h → modules/heliumUtil/include/mainMacro.h
diff --git a/modules/util/include/pathGlobal.h → modules/heliumUtil/include/pathGlobal.h b/modules/util/include/pathGlobal.h → modules/heliumUtil/include/pathGlobal.h
@@ -11,7 +11,7 @@
 #ifndef HELIUM_PATH_GLOBAL_INCLUDED
 #define HELIUM_PATH_GLOBAL_INCLUDED
 
-#include <Polycode.h>
+#include "Polycode.h"
 
 static const Polycode::String g_helium_resource_path("helium_resource");
 

diff --git a/modules/util/src/debugTools.cpp → modules/heliumUtil/src/debugTools.cpp b/modules/util/src/debugTools.cpp → modules/heliumUtil/src/debugTools.cpp
diff --git a/modules/util/src/pathGlobal.cpp → modules/heliumUtil/src/pathGlobal.cpp b/modules/util/src/pathGlobal.cpp → modules/heliumUtil/src/pathGlobal.cpp
diff --git a/modules/helium_2D_Object/CMakeLists.txt b/modules/helium_2D_Object/CMakeLists.txt
@@ -0,0 +1,34 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+MESSAGE(STATUS "HELIUM MODULE: SCREEN OBJECTS")
+
+PROJECT( helium_2D_Object )
+
+INCLUDE( heliumIncludes )
+
+SET( HELIUM_2D_OBJECT_DIR ${HELIUM_MODULES_DIR}/helium_2D_Object )
+
+SET ( heliumScreenObjects_SRCS
+        ${HELIUM_2D_OBJECT_DIR}/src/heliumScreenConsole.cpp
+        ${HELIUM_2D_OBJECT_DIR}/src/heliumScreenObjects.cpp
+        ${HELIUM_2D_OBJECT_DIR}/src/heliumScreenButton.cpp 
+        ${HELIUM_2D_OBJECT_DIR}/src/heliumPreparedScreenButton.cpp
+    )
+
+SET ( heliumScreenObjects_HDRS
+        ${HELIUM_2D_OBJECT_DIR}/include/heliumScreenConsole.h
+        ${HELIUM_2D_OBJECT_DIR}/include/heliumScreenObjects.h
+        ${HELIUM_2D_OBJECT_DIR}/include/heliumScreenButton.h
+        ${HELIUM_2D_OBJECT_DIR}/include/heliumPreparedScreenButton.h
+    ) 
+
+ADD_LIBRARY ( helium_2D_Object STATIC
+                    ${heliumScreenObjects_SRCS}
+                    ${heliumScreenbjects_HDRS} 
+            )
+
+TARGET_LINK_LIBRARIES ( helium_2D_Object
+                            ${LIB_POLYCODE}
+                            helium_2D_Object
+                      )
+
diff --git a/...ects/include/heliumPreparedScreenButton.h → ...ject/include/heliumPreparedScreenButton.h b/...ects/include/heliumPreparedScreenButton.h → ...ject/include/heliumPreparedScreenButton.h
diff --git a/...creenObjects/include/heliumScreenButton.h → ...um_2D_Object/include/heliumScreenButton.h b/...creenObjects/include/heliumScreenButton.h → ...um_2D_Object/include/heliumScreenButton.h
diff --git a/...reenObjects/include/heliumScreenConsole.h → ...m_2D_Object/include/heliumScreenConsole.h b/...reenObjects/include/heliumScreenConsole.h → ...m_2D_Object/include/heliumScreenConsole.h
diff --git a/...reenObjects/include/heliumScreenObjects.h → ...m_2D_Object/include/heliumScreenObjects.h b/...reenObjects/include/heliumScreenObjects.h → ...m_2D_Object/include/heliumScreenObjects.h
diff --git a/...bjects/src/heliumPreparedScreenButton.cpp → ...Object/src/heliumPreparedScreenButton.cpp b/...bjects/src/heliumPreparedScreenButton.cpp → ...Object/src/heliumPreparedScreenButton.cpp
diff --git a/...mScreenObjects/src/heliumScreenButton.cpp → ...lium_2D_Object/src/heliumScreenButton.cpp b/...mScreenObjects/src/heliumScreenButton.cpp → ...lium_2D_Object/src/heliumScreenButton.cpp
diff --git a/...ScreenObjects/src/heliumScreenConsole.cpp → ...ium_2D_Object/src/heliumScreenConsole.cpp b/...ScreenObjects/src/heliumScreenConsole.cpp → ...ium_2D_Object/src/heliumScreenConsole.cpp
diff --git a/...ScreenObjects/src/heliumScreenObjects.cpp → ...ium_2D_Object/src/heliumScreenObjects.cpp b/...ScreenObjects/src/heliumScreenObjects.cpp → ...ium_2D_Object/src/heliumScreenObjects.cpp
diff --git a/modules/helium_3D_Object/CMakeLists.txt b/modules/helium_3D_Object/CMakeLists.txt
@@ -0,0 +1,29 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+MESSAGE(STATUS "HELIUM MODULE: 3D OBJECTS WORLD")
+
+PROJECT( helium_3D_Object )
+
+INCLUDE( heliumIncludes )
+
+SET( HELIUM_3D_OBJECT_DIR ${HELIUM_MODULES_DIR}/helium_3D_Object )
+
+SET ( helium_3D_Object_SRCS
+        ${HELIUM_3D_OBJECT_DIR}/src/heliumSceneObjects.cpp
+        ${HELIUM_3D_OBJECT_DIR}/src/heliumPreparedSceneObjects.cpp
+    )
+
+SET ( helium_3D_Object_HDRS
+        ${HELIUM_3D_OBJECT_DIR}/include/heliumSceneObjects.h
+        ${HELIUM_3D_OBJECT_DIR}/include/heliumPreparedSceneObjects.h
+    ) 
+
+ADD_LIBRARY ( helium_3D_Object STATIC
+                    ${helium_3D_Object_SRCS}
+                    ${helium_3D_Object_HDRS} 
+            )
+
+TARGET_LINK_LIBRARIES ( helium_3D_Object
+                            ${LIB_POLYCODE}
+                      )
+
diff --git a/...ects/include/heliumPreparedSceneObjects.h → ...ject/include/heliumPreparedSceneObjects.h b/...ects/include/heliumPreparedSceneObjects.h → ...ject/include/heliumPreparedSceneObjects.h
diff --git a/...SceneObjects/include/heliumSceneObjects.h → ...um_3D_Object/include/heliumSceneObjects.h b/...SceneObjects/include/heliumSceneObjects.h → ...um_3D_Object/include/heliumSceneObjects.h
diff --git a/...bjects/src/heliumPreparedSceneObjects.cpp → ...Object/src/heliumPreparedSceneObjects.cpp b/...bjects/src/heliumPreparedSceneObjects.cpp → ...Object/src/heliumPreparedSceneObjects.cpp
diff --git a/...umSceneObjects/src/heliumSceneObjects.cpp → ...lium_3D_Object/src/heliumSceneObjects.cpp b/...umSceneObjects/src/heliumSceneObjects.cpp → ...lium_3D_Object/src/heliumSceneObjects.cpp
diff --git a/modules/userInput/CMakeLists.txt b/modules/userInput/CMakeLists.txt
diff --git a/modules/util/CMakeLists.txt b/modules/util/CMakeLists.txt
diff --git a/tests/firstKeyControl/CMakeLists.txt b/tests/firstKeyControl/CMakeLists.txt
@@ -1,6 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
-MESSAGE(STATUS "\"FIRST KEY CONTROL TEST\" GENERATING")
+MESSAGE(STATUS "TEST: <<firstKeyControl>> GENERATING")
 
 PROJECT( firstKeyControl )
 
@@ -29,12 +29,13 @@ ADD_EXECUTABLE ( firstKeyControl
                )
 
 IF(WIN32)
-    set_target_properties( firstKeyControl PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:windows")
+    set_target_properties( firstKeyControl PROPERTIES LINK_FLAGS_DEBUG          "/SUBSYSTEM:windows")
     set_target_properties( firstKeyControl PROPERTIES COMPILE_DEFINITIONS_DEBUG "_WINDOWS")
     set_target_properties( firstKeyControl PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:windows")
     set_target_properties( firstKeyControl PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "_WINDOWS")
-    set_target_properties( firstKeyControl PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:windows")
+    set_target_properties( firstKeyControl PROPERTIES LINK_FLAGS_RELEASE    "/SUBSYSTEM:windows")
     set_target_properties( firstKeyControl PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows")
+
     SET_TARGET_PROPERTIES( firstKeyControl PROPERTIES COMPILE_DEFINITIONS _UNICODE,UNICODE)
 ENDIF(WIN32)
 
@@ -43,8 +44,8 @@ TARGET_LINK_LIBRARIES ( firstKeyControl
                         heliumGameCore
                         heliumUserInput
                         heliumUtil
-                        heliumScreenObjects
-                        heliumSceneObjects
+                        helium_2D_Object
+                        helium_3D_Object
                       )
 
 INSTALL ( TARGETS firstKeyControl

diff --git a/tests/sceneWorldDevelop/CMakeLists.txt b/tests/sceneWorldDevelop/CMakeLists.txt
@@ -43,8 +43,8 @@ TARGET_LINK_LIBRARIES ( sceneWorldDevelop
                         heliumGameCore
                         heliumUserInput
                         heliumUtil
-                        heliumScreenObjects
-                        heliumSceneObjects
+                        helium_2D_Object
+                        helium_3D_Object
                       )
 
 INSTALL ( TARGETS sceneWorldDevelop