restructure

CMakeLists.txt

@@ -0,0 +1,47 @@
+cmake_minimum_required(VERSION 3.12)
+project(sockscape)
+
+file(GLOB_RECURSE server_src
+    "src/*.hpp"
+    "src/*.cpp"
+    "src/*.c"
+    "src/*.h"
+)
+
+file(GLOB_RECURSE client_src
+    "client/src/*.hpp"
+    "clientsrc/*.cpp"
+)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
+
+find_package(OPENGL REQUIRED)
+find_package(GLEW REQUIRED)
+find_package(SDL2 REQUIRED)
+find_package(SDL2_image REQUIRED)
+find_package(SDL2_ttf REQUIRED)
+
+add_executable(client client_src)
+target_include_directories(client ${PROJECT_SOURCE_DIR}/include
+                                  ${OPENGL_INCLUDE_DIR}
+                                  ${GLEW_INCLUDE_DIR}
+                                  ${SDL2_INCLUDE_DIR}
+                                  ${SDL2_IMAGE_INCLUDE_DIR}
+                                  ${SDL2_TTF_INCLUDE_DIR})
+target_link_libraries(client ${OPENGL_LIBRARIES}
+                             ${GLEW_LIBRARY}
+                             ${SDL2_LIBRARY}
+                             ${SDL2_IMAGE_LIBRARIES}
+                             ${SDL2_TTF_LIBRARIES})
+install(TARGETS client RUNTIME DESTINATION bin/client)
+
+add_executable(server server_src)
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+    target_link_libraries(server wsock32 ws2_32)
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    target_link_libraries(server dl pthread nsl resolv)
+else()
+    target_link_libraries(server dl pthread socket nsl resolv)
+endif()
+install(TARGETS server RUNTIME DESTINATION bin/server)

client/CMakeLists.txt

@@ -1,31 +0,0 @@
-cmake_minimum_required(VERSION 3.12)
-project(client)
-
-file(GLOB_RECURSE client_str
-    "src/*.hpp"
-    "src/*.cpp"
-)
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
-
-find_package(OPENGL REQUIRED)
-find_package(GLEW REQUIRED)
-find_package(SDL2 REQUIRED)
-find_package(SDL2_image REQUIRED)
-find_package(SDL2_ttf REQUIRED)
-
-add_executable(client src/main.cpp)
-include_directories(${PROJECT_SOURCE_DIR}/include
-                    ${OPENGL_INCLUDE_DIR}
-                    ${GLEW_INCLUDE_DIR}
-                    ${SDL2_INCLUDE_DIR}
-                    ${SDL2_IMAGE_INCLUDE_DIR}
-                    ${SDL2_TTF_INCLUDE_DIR})
-target_link_libraries(client ${OPENGL_LIBRARIES}
-                             ${GLEW_LIBRARY}
-                             ${SDL2_LIBRARY}
-                             ${SDL2_IMAGE_LIBRARIES}
-                             ${SDL2_TTF_LIBRARIES})
-
-install(TARGETS client RUNTIME DESTINATION bin)