Build: Convert CMakeLists.txt to be more Serenity friendly

Author: Quaker762

CMakeLists.txt

@@ -3,16 +3,7 @@ cmake_policy(SET CMP0048 NEW)
 
 project (quake2sdl VERSION 0.17)
 
-set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/Modules")
 set (CMAKE_C_FLAGS_RELEASE "-O3")
 find_package (SDL2 REQUIRED)
-find_package (OpenGL REQUIRED)
-
-option (WITH_RETEX "Support for retexture" OFF)
-option (WITH_QMAX "Improved graphics" OFF)
-
-if (WITH_QMAX)
-  find_package (JPEG REQUIRED)
-endif (WITH_QMAX)
 
 add_subdirectory (src)

src/CMakeLists.txt

@@ -2,23 +2,7 @@ set (quake_resource_libdir ${CMAKE_INSTALL_PREFIX}/lib/quake2sdl)
 set (quake_resource_datadir ${CMAKE_INSTALL_PREFIX}/share/quake2)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/q_resources.h.in ${CMAKE_CURRENT_BINARY_DIR}/q_resources.h)
 
-add_definitions (-DHAVE_IPV6 -DLINUX_VERSION="1")
-include_directories (${SDL2_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${OPENGL_INCLUDE_DIR})
-if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-  add_definitions (-DHAVE_SIN6_LEN)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  # Linux-specific stuff like mremap
-  add_definitions (-D_GNU_SOURCE)
-endif ()
-
-if (WITH_RETEX)
-  add_definitions (-DRETEX)
-endif (WITH_RETEX)
-
-if (WITH_QMAX)
-  add_definitions (-DQMAX)
-  include_directories (${JPEG_INCLUDE_DIR})
-endif (WITH_QMAX)
+include_directories (${SDL2_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 set (Q2_SOURCES
   client/cl_cin.c
@@ -65,22 +49,14 @@ set (Q2_SOURCES
   linux/vid_so.c
   linux/sys_linux.c
   linux/glob.c
-  linux/net_udp6.c
+  linux/net_udp.c
   game/q_shared.c
   linux/snd_sdl.c
-  )
-
-if (WITH_QMAX)
-  set (Q2_SOURCES ${Q2_SOURCES} client/cl_fxmax.c)
-else (WITH_QMAX)
-  set (Q2_SOURCES ${Q2_SOURCES} client/cl_fx.c)
-endif (WITH_QMAX)
+)
 
+set (Q2_SOURCES ${Q2_SOURCES} client/cl_fx.c)
 add_executable (quake2 ${Q2_SOURCES})
-target_link_libraries (quake2 ${SDL2_LIBRARY} m)
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  target_link_libraries (quake2 dl)
-endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+target_link_libraries (quake2 dl SDL2 pthread gfx gui c m)
 
 add_library (ref-softsdl SHARED
   ref_soft/r_aclip.c
@@ -108,36 +84,6 @@ add_library (ref-softsdl SHARED
   )
 set_target_properties (ref-softsdl PROPERTIES OUTPUT_NAME ref_softsdl PREFIX "")
 
-if (WITH_QMAX)
-  set (GL_DIR ref_candygl)
-else (WITH_QMAX)
-  set (GL_DIR ref_gl)
-endif (WITH_QMAX)
-
-add_library (ref-sdlgl SHARED
-  ${GL_DIR}/gl_draw.c
-  ${GL_DIR}/gl_image.c
-  ${GL_DIR}/gl_light.c
-  ${GL_DIR}/gl_mesh.c
-  ${GL_DIR}/gl_model.c
-  ${GL_DIR}/gl_rmain.c
-  ${GL_DIR}/gl_rmisc.c
-  ${GL_DIR}/gl_rsurf.c
-  ${GL_DIR}/gl_warp.c
-  linux/qgl_linux.c
-  game/q_shared.c
-  linux/q_shlinux.c
-  linux/glob.c
-  linux/rw_sdl.c
-  linux/rw_linux.c
-  linux/joystick.c
-)
-if (WITH_QMAX)
-  target_link_libraries (ref-sdlgl ${JPEG_LIBRARY})
-endif (WITH_QMAX)
-target_compile_definitions (ref-sdlgl PRIVATE -DOPENGL)
-set_target_properties (ref-sdlgl PROPERTIES OUTPUT_NAME ref_sdlgl PREFIX "")
-
 add_library (game-base SHARED
   game/g_ai.c
   game/p_client.c
@@ -190,5 +136,5 @@ add_library (game-base SHARED
 set_target_properties (game-base PROPERTIES OUTPUT_NAME game PREFIX "")
 
 install (TARGETS quake2 RUNTIME DESTINATION bin)
-install (TARGETS ref-softsdl ref-sdlgl LIBRARY DESTINATION lib/quake2sdl)
+install (TARGETS ref-softsdl LIBRARY DESTINATION lib/quake2sdl)
 install (TARGETS game-base LIBRARY DESTINATION lib/quake2sdl/baseq2)