Removed OgreMax dependency, started working on changing from MyGUI to…

… CEGUI
andrewfenn · Oct 7, 2012 · 69f7724 · 69f7724
1 parent 3bce326
commit 69f7724
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -136,10 +136,8 @@ add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/enet")
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/sqlite3")
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/poshlib")
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/TinyXML")
-add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/OgreMax")
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/UnitTest++")
 
-
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/tests/client")
 add_subdirectory(code/client)
 #add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/tests/server")

diff --git a/cmake/scripts/SourceFiles.cmake b/cmake/scripts/SourceFiles.cmake
@@ -1,4 +1,7 @@
 
+# Nice little helper function for making sure the full path of the source file is
+# tacked on when we come to including the files in the unit tests
+
 macro(source_files name)
     set(_temp_source_files "")
     foreach(src_file ${${name}})

diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
@@ -9,6 +9,7 @@ SET(HardwarClient_PATCH_VERSION ${HARDWAR_PATCH_VERSION})
 
 add_subdirectory("core/")
 add_subdirectory("tasks/")
+add_subdirectory("states/")
 source_group("Client" FILES ${client_source})
 
 set(shared_source
@@ -48,14 +49,13 @@ if (WIN32)
    set(exe "WIN32")
 endif ()
 
-link_libraries(Enet SQLite OgreMax)
+link_libraries(Enet SQLite)
 
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin/)
 add_executable(client ${exe} ${client_source} ${shared_source})
 
 add_dependencies(client SQLite)
 add_dependencies(client Enet)
-add_dependencies(client OgreMax)
 
 add_custom_command(TARGET client PRE_BUILD COMMAND ${CMAKE_BINARY_DIR}/bin/tests/clientTest)
 

diff --git a/code/client/core/src/GameManager.cpp b/code/client/core/src/GameManager.cpp
@@ -25,7 +25,7 @@
 //#include "ZoneTask.h"
 //#include "GuiTask.h"
 
-//#include "MenuState.h"
+#include "MenuState.h"
 //#include "ConsoleState.h"
 
 namespace Client
@@ -51,7 +51,7 @@ GameManager::GameManager(Ogre::Root* root)
 
     /* attach game modules to root state */
     //mRootState->add(OGRE_NEW ConsoleState);
-    //mRootState->add(OGRE_NEW MenuState);
+    mRootState->add(OGRE_NEW MenuState);
 
     mMaxFPS = 60;
     mDelayTime = ceil( (float) 1000 / mMaxFPS );

diff --git a/code/client/states/CMakeLists.txt b/code/client/states/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+add_subdirectory("menu/")
+
+set(state_source
+    "src/PlayState.cpp"
+)
+
+source_files("state_source")
+set(client_source ${client_source} ${state_source} PARENT_SCOPE)
+
+include_directories("include")
+
diff --git a/code/client/states/menu/CMakeLists.txt b/code/client/states/menu/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+set(menustate_source
+    "src/MenuState.cpp"
+)
+
+source_files("menustate_source")
+set(client_source ${client_source} ${menustate_source} PARENT_SCOPE)
+
+include_directories("include")
+
diff --git a/code/client/tasks/include/GuiTask.h b/code/client/tasks/include/GuiTask.h
@@ -1,6 +1,6 @@
 /* 
     This file is part of Hardwar - A remake of the classic flight sim shooter
-    Copyright © 2010  Andrew Fenn
+    Copyright © 2010-2012  Andrew Fenn
     
     Hardwar is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/code/client/tasks/include/InputTask.h b/code/client/tasks/include/InputTask.h
@@ -1,6 +1,6 @@
 /* 
     This file is part of Hardwar - A remake of the classic flight sim shooter
-    Copyright © 2008-2010  Andrew Fenn
+    Copyright © 2008-2012  Andrew Fenn
     
     Hardwar is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/code/client/tasks/include/NetworkTask.h b/code/client/tasks/include/NetworkTask.h
@@ -1,6 +1,6 @@
 /* 
     This file is part of Hardwar - A remake of the classic flight sim shooter
-    Copyright © 2008-2010  Andrew Fenn
+    Copyright © 2008-2012  Andrew Fenn
     
     Hardwar is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/code/client/tasks/include/Zone.h b/code/client/tasks/include/Zone.h
@@ -1,6 +1,6 @@
 /* 
     This file is part of Hardwar - A remake of the classic flight sim shooter
-    Copyright © 2010  Andrew Fenn
+    Copyright © 2010 - 2012  Andrew Fenn
     
     Hardwar is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/code/client/tasks/include/ZoneTask.h b/code/client/tasks/include/ZoneTask.h
@@ -1,6 +1,6 @@
 /* 
     This file is part of Hardwar - A remake of the classic flight sim shooter
-    Copyright © 2010  Andrew Fenn
+    Copyright © 2010 - 2012  Andrew Fenn
     
     Hardwar is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
@@ -5,6 +5,7 @@ project(clientTest)
 
 add_subdirectory("${CMAKE_SOURCE_DIR}/code/client/core/" "${CMAKE_CURRENT_BINARY_DIR}/client/core/")
 add_subdirectory("${CMAKE_SOURCE_DIR}/code/client/tasks/" "${CMAKE_CURRENT_BINARY_DIR}/client/tasks/")
+add_subdirectory("${CMAKE_SOURCE_DIR}/code/client/states/" "${CMAKE_CURRENT_BINARY_DIR}/client/states/")
 
 set(clientTest_source
     ${client_source}