From af1ef76c70159fdb2242466886c80c2f914bacf9 Mon Sep 17 00:00:00 2001 From: oxmox Date: Sat, 11 Mar 2023 12:14:56 +0100 Subject: [PATCH] build fixes for FreeBSD-13.1 --- CMakeLists.txt | 2 +- external/CMakeLists.txt | 10 +++++++++- src/doompanning.cc | 6 ++++++ src/dp_doom/linuxdoom-1.10/i_net.c | 4 ++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32a0317..83a4125 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ if (NOT DOOMPANNING_INTERNAL_SDL) find_package(SDL2 2.0.17) endif() -find_file(DOOM1_WAD doom1.wad HINTS /usr/share/games/doom) +find_file(DOOM1_WAD doom1.wad HINTS /usr/share/games/doom /usr/local/share/doom) if (DOOM1_WAD) file(CREATE_LINK ${DOOM1_WAD} doom1.wad COPY_ON_ERROR SYMBOLIC) else() diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 9f975cc..f999d3a 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -20,4 +20,12 @@ add_library(imgui OBJECT ) target_include_directories(imgui PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/imgui) -target_link_libraries(imgui PUBLIC SDL2::SDL2-static) + +find_file(XLIB_HEADER Xlib.h PATH_SUFFIXES X11) +if (XLIB_HEADER) + message(">> XLIB_HEADER found: ${XLIB_HEADER}") + get_filename_component(XLIB_INCLUDE_DIR ${XLIB_HEADER} DIRECTORY) + target_include_directories(imgui SYSTEM PUBLIC ${XLIB_INCLUDE_DIR}/../) +endif() + +target_link_libraries(imgui PUBLIC SDL2::SDL2) diff --git a/src/doompanning.cc b/src/doompanning.cc index 640cfe5..df3b191 100644 --- a/src/doompanning.cc +++ b/src/doompanning.cc @@ -108,6 +108,12 @@ struct ControllerActions #define DOOM_EXECUTABLE "dp_doom" +#if defined(__FREEBSD__) +extern char **environ; +char **__environ = environ; +#endif + + void spawn_doom_posix_spawn(ControllerContext &ctx) { (void) ctx; diff --git a/src/dp_doom/linuxdoom-1.10/i_net.c b/src/dp_doom/linuxdoom-1.10/i_net.c index 863c916..dc1ee54 100644 --- a/src/dp_doom/linuxdoom-1.10/i_net.c +++ b/src/dp_doom/linuxdoom-1.10/i_net.c @@ -81,6 +81,10 @@ boolean NetListen (void); // NETWORKING // +#ifndef IPPORT_USERRESERVED +#define IPPORT_USERRESERVED 5000 +#endif + int DOOMPORT = (IPPORT_USERRESERVED +0x1d ); int sendsocket;