SDL2_net and chocolate-server

CMakeLists.txt

@@ -21,7 +21,6 @@ set(PROGRAM_PREFIX "${PROGRAM_SPREFIX}-")
 
 configure_file(config.cmake.h config.h)
 
-add_subdirectory(midiproc)
-add_subdirectory(opl)
-add_subdirectory(pcsound)
-add_subdirectory(textscreen)
+foreach(SUBDIR textscreen midiproc opl pcsound src)
+    add_subdirectory("${SUBDIR}")
+endforeach()

cmake/FindSDL2_net.cmake

@@ -0,0 +1,79 @@
+# FindSDL2_net.cmake
+#
+# Copyright (c) 2018, Alex Mayfield <alexmax2742@gmail.com>
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the <organization> nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Currently works with the following generators:
+# - Visual Studio
+
+# Cache variable that allows you to point CMake at a directory containing
+# an extracted development library.
+set(SDL2_NET_DIR "${SDL2_NET_DIR}" CACHE PATH "Location of SDL2_net library directory")
+
+# Find the include directory.
+find_path(SDL2_NET_INCLUDE_DIR "SDL_net.h"
+          PATHS "${SDL2_NET_DIR}/include")
+
+# Find the version.  Taken and modified from CMake's FindSDL.cmake.
+if(SDL2_NET_INCLUDE_DIR AND EXISTS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h")
+    file(STRINGS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h" SDL2_NET_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_NET_MAJOR_VERSION[ \t]+[0-9]+$")
+    file(STRINGS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h" SDL2_NET_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_NET_MINOR_VERSION[ \t]+[0-9]+$")
+    file(STRINGS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h" SDL2_NET_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_NET_PATCHLEVEL[ \t]+[0-9]+$")
+    string(REGEX REPLACE "^#define[ \t]+SDL_NET_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_NET_VERSION_MAJOR "${SDL2_NET_VERSION_MAJOR_LINE}")
+    string(REGEX REPLACE "^#define[ \t]+SDL_NET_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_NET_VERSION_MINOR "${SDL2_NET_VERSION_MINOR_LINE}")
+    string(REGEX REPLACE "^#define[ \t]+SDL_NET_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_NET_VERSION_PATCH "${SDL2_NET_VERSION_PATCH_LINE}")
+    set(SDL2_NET_VERSION "${SDL2_NET_VERSION_MAJOR}.${SDL2_NET_VERSION_MINOR}.${SDL2_NET_VERSION_PATCH}")
+    unset(SDL2_NET_VERSION_MAJOR_LINE)
+    unset(SDL2_NET_VERSION_MINOR_LINE)
+    unset(SDL2_NET_VERSION_PATCH_LINE)
+    unset(SDL2_NET_VERSION_MAJOR)
+    unset(SDL2_NET_VERSION_MINOR)
+    unset(SDL2_NET_VERSION_PATCH)
+endif()
+
+# Find the library.
+if(CMAKE_SIZEOF_VOID_P STREQUAL 8)
+    find_library(SDL2_NET_LIBRARY "SDL2_net"
+                 PATHS "${SDL2_NET_DIR}/lib/x64")
+else()
+    find_library(SDL2_NET_LIBRARY "SDL2"
+                 PATHS "${SDL2_NET_DIR}/lib/x86")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SDL2_net
+    FOUND_VAR SDL2_NET_FOUND
+    REQUIRED_VARS SDL2_NET_INCLUDE_DIR SDL2_NET_LIBRARY
+    VERSION_VAR SDL2_NET_VERSION
+)
+
+if(SDL2_NET_FOUND)
+    # Imported target.
+    add_library(SDL2::net UNKNOWN IMPORTED)
+    set_target_properties(SDL2::net PROPERTIES
+                          INTERFACE_INCLUDE_DIRECTORIES "${SDL2_NET_INCLUDE_DIR}"
+                          INTERFACE_LINK_LIBRARIES SDL2::SDL2
+                          IMPORTED_LOCATION "${SDL2_NET_LIBRARY}")
+endif()

src/.gitignore

@@ -16,6 +16,7 @@ chocolate-setup
 *.exe
 *.desktop
 *.txt
+!CMakeLists.txt
 *.appdata.xml
 tags
 TAGS

src/CMakeLists.txt

@@ -0,0 +1,32 @@
+foreach(SUBDIR doom heretic hexen strife setup)
+    add_subdirectory("${SUBDIR}")
+endforeach()
+
+# Common source files used by absolutely everything:
+
+set(COMMON_SOURCE_FILES
+    i_main.c
+    i_system.c           i_system.h
+    m_argv.c             m_argv.h
+    m_misc.c             m_misc.h)
+
+# Dedicated server (chocolate-server):
+
+set(DEDSERV_FILES
+    d_dedicated.c
+    d_mode.c             d_mode.h
+    i_timer.c            i_timer.h
+    net_common.c         net_common.h
+    net_dedicated.c      net_dedicated.h
+    net_io.c             net_io.h
+    net_packet.c         net_packet.h
+    net_sdl.c            net_sdl.h
+    net_query.c          net_query.h
+    net_server.c         net_server.h
+    net_structrw.c       net_structrw.h
+    z_native.c           z_zone.h)
+
+add_executable("${PROGRAM_PREFIX}server" ${COMMON_SOURCE_FILES} ${DEDSERV_FILES})
+target_include_directories("${PROGRAM_PREFIX}server"
+                           PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
+target_link_libraries("${PROGRAM_PREFIX}server" SDL2::SDL2main SDL2::net)