From 3f00ee4f31a7059b20d96b7b12ffe2549c0b7990 Mon Sep 17 00:00:00 2001 From: gmueller Date: Mon, 17 Jan 2011 21:50:50 +0100 Subject: [PATCH] structure changes --- CMakeLists.txt | 24 +++++++++- src/CMakeLists.txt | 77 -------------------------------- src/client/CMakeLists.txt | 19 ++++++++ src/{ => client}/Client.cpp | 0 src/{ => client}/Client.h | 0 src/{ => client}/Explosion.cpp | 0 src/{ => client}/Explosion.h | 0 src/{ => client}/main.cpp | 0 src/{ => client}/oglfont.cpp | 0 src/{ => client}/oglfont.h | 0 src/{ => common}/Application.cpp | 0 src/{ => common}/Application.h | 0 src/{ => common}/Arguments.h | 0 src/{ => common}/Network.cpp | 0 src/{ => common}/Network.h | 0 src/{ => common}/Schedule.h | 0 src/{ => common}/Time.cpp | 0 src/{ => common}/Time.h | 0 src/{ => common}/common.h | 0 src/{ => common}/game.cpp | 0 src/{ => common}/game.h | 0 src/{ => server}/server.cpp | 1 - 22 files changed, 41 insertions(+), 80 deletions(-) delete mode 100644 src/CMakeLists.txt create mode 100644 src/client/CMakeLists.txt rename src/{ => client}/Client.cpp (100%) rename src/{ => client}/Client.h (100%) rename src/{ => client}/Explosion.cpp (100%) rename src/{ => client}/Explosion.h (100%) rename src/{ => client}/main.cpp (100%) rename src/{ => client}/oglfont.cpp (100%) rename src/{ => client}/oglfont.h (100%) rename src/{ => common}/Application.cpp (100%) rename src/{ => common}/Application.h (100%) rename src/{ => common}/Arguments.h (100%) rename src/{ => common}/Network.cpp (100%) rename src/{ => common}/Network.h (100%) rename src/{ => common}/Schedule.h (100%) rename src/{ => common}/Time.cpp (100%) rename src/{ => common}/Time.h (100%) rename src/{ => common}/common.h (100%) rename src/{ => common}/game.cpp (100%) rename src/{ => common}/game.h (100%) rename src/{ => server}/server.cpp (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1821f3b..d788928 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,31 @@ cmake_minimum_required (VERSION 2.6) project (GREMLIN C CXX) +if (MSVC) + add_definitions(/D_USE_MATH_DEFINES) +endif(MSVC) + +if (WIN32) + set(PLATFORM_LIBRARIES ws2_32 winmm) +endif(WIN32) + +if(UNIX) + set(PLATFORM_LIBRARIES pthread) +endif(UNIX) + +include_directories (${GREMLIN_SOURCE_DIR}/libs/glfw/include) +include_directories (${GREMLIN_SOURCE_DIR}/libs/spark/include) +include_directories (${GREMLIN_SOURCE_DIR}/libs/enet/include) + find_package(OpenGL) +add_subdirectory (libs/enet) +add_subdirectory (src/common) +add_subdirectory (src/server) + if (OPENGL_FOUND) add_subdirectory (libs/glfw) add_subdirectory (libs/spark) + add_subdirectory (src/client) endif(OPENGL_FOUND) -add_subdirectory (libs/enet) -add_subdirectory (src) + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt deleted file mode 100644 index 61742fc..0000000 --- a/src/CMakeLists.txt +++ /dev/null @@ -1,77 +0,0 @@ -include_directories (${GREMLIN_SOURCE_DIR}/libs/glfw/include) -include_directories (${GREMLIN_SOURCE_DIR}/libs/spark/include) -include_directories (${GREMLIN_SOURCE_DIR}/libs/enet/include) -include_directories (${GREMLIN_SOURCE_DIR}/src) - -if (MSVC) - add_definitions(/D_USE_MATH_DEFINES) -endif(MSVC) - -if (WIN32) - set(PLATFORM_LIBRARIES ws2_32 winmm) -endif(WIN32) - -if(UNIX) - set(PLATFORM_LIBRARIES pthread) -endif(UNIX) - -if (OPENGL_FOUND) - - SET(VIDEO_SOURCES Explosion oglfont Client) - - # define executable - add_executable( gremlin - Application - main - game - Time - Network - ${VIDEO_SOURCES} - ) - - add_dependencies( gremlin - enet - ) - - target_link_libraries(gremlin - enet ${PLATFORM_LIBRARIES} - ) - -endif(OPENGL_FOUND) - -# define executable -add_executable( gremlin_dedicated - Application - server - game - Time - Network -) - -add_dependencies( gremlin_dedicated - enet -) - - -target_link_libraries(gremlin_dedicated - enet ${PLATFORM_LIBRARIES} -) - -if (OPENGL_FOUND) - # set dependencies - add_dependencies( gremlin - glfw spark - ) - - add_definitions(-DENABLE_VIDEO) - - if(UNIX) - target_link_libraries(gremlin - GL GLU X11 Xrandr - ) - endif(UNIX) - - target_link_libraries(gremlin - glfw spark ${OPENGL_LIBRARIES} - ) -endif(OPENGL_FOUND) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt new file mode 100644 index 0000000..9eebd26 --- /dev/null +++ b/src/client/CMakeLists.txt @@ -0,0 +1,19 @@ +include_directories (${GREMLIN_SOURCE_DIR}/src/common) + +# define executable +add_executable( gremlin + Client + Explosion + main + oglfont +) + +add_dependencies( gremlin + common + glfw + spark +) + +target_link_libraries(gremlin + common enet glfw spark ${PLATFORM_LIBRARIES} ${OPENGL_LIBRARIES} +) diff --git a/src/Client.cpp b/src/client/Client.cpp similarity index 100% rename from src/Client.cpp rename to src/client/Client.cpp diff --git a/src/Client.h b/src/client/Client.h similarity index 100% rename from src/Client.h rename to src/client/Client.h diff --git a/src/Explosion.cpp b/src/client/Explosion.cpp similarity index 100% rename from src/Explosion.cpp rename to src/client/Explosion.cpp diff --git a/src/Explosion.h b/src/client/Explosion.h similarity index 100% rename from src/Explosion.h rename to src/client/Explosion.h diff --git a/src/main.cpp b/src/client/main.cpp similarity index 100% rename from src/main.cpp rename to src/client/main.cpp diff --git a/src/oglfont.cpp b/src/client/oglfont.cpp similarity index 100% rename from src/oglfont.cpp rename to src/client/oglfont.cpp diff --git a/src/oglfont.h b/src/client/oglfont.h similarity index 100% rename from src/oglfont.h rename to src/client/oglfont.h diff --git a/src/Application.cpp b/src/common/Application.cpp similarity index 100% rename from src/Application.cpp rename to src/common/Application.cpp diff --git a/src/Application.h b/src/common/Application.h similarity index 100% rename from src/Application.h rename to src/common/Application.h diff --git a/src/Arguments.h b/src/common/Arguments.h similarity index 100% rename from src/Arguments.h rename to src/common/Arguments.h diff --git a/src/Network.cpp b/src/common/Network.cpp similarity index 100% rename from src/Network.cpp rename to src/common/Network.cpp diff --git a/src/Network.h b/src/common/Network.h similarity index 100% rename from src/Network.h rename to src/common/Network.h diff --git a/src/Schedule.h b/src/common/Schedule.h similarity index 100% rename from src/Schedule.h rename to src/common/Schedule.h diff --git a/src/Time.cpp b/src/common/Time.cpp similarity index 100% rename from src/Time.cpp rename to src/common/Time.cpp diff --git a/src/Time.h b/src/common/Time.h similarity index 100% rename from src/Time.h rename to src/common/Time.h diff --git a/src/common.h b/src/common/common.h similarity index 100% rename from src/common.h rename to src/common/common.h diff --git a/src/game.cpp b/src/common/game.cpp similarity index 100% rename from src/game.cpp rename to src/common/game.cpp diff --git a/src/game.h b/src/common/game.h similarity index 100% rename from src/game.h rename to src/common/game.h diff --git a/src/server.cpp b/src/server/server.cpp similarity index 99% rename from src/server.cpp rename to src/server/server.cpp index 3cbb4c6..0308369 100644 --- a/src/server.cpp +++ b/src/server/server.cpp @@ -27,4 +27,3 @@ int main(int argc, const char **argv) { return 1; } } -