build fixes for FreeBSD-13.1
This commit is contained in:
parent
d8907d184b
commit
af1ef76c70
4 changed files with 20 additions and 2 deletions
|
@ -16,7 +16,7 @@ if (NOT DOOMPANNING_INTERNAL_SDL)
|
||||||
find_package(SDL2 2.0.17)
|
find_package(SDL2 2.0.17)
|
||||||
endif()
|
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)
|
if (DOOM1_WAD)
|
||||||
file(CREATE_LINK ${DOOM1_WAD} doom1.wad COPY_ON_ERROR SYMBOLIC)
|
file(CREATE_LINK ${DOOM1_WAD} doom1.wad COPY_ON_ERROR SYMBOLIC)
|
||||||
else()
|
else()
|
||||||
|
|
10
external/CMakeLists.txt
vendored
10
external/CMakeLists.txt
vendored
|
@ -20,4 +20,12 @@ add_library(imgui OBJECT
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(imgui PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/imgui)
|
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)
|
||||||
|
|
|
@ -108,6 +108,12 @@ struct ControllerActions
|
||||||
|
|
||||||
#define DOOM_EXECUTABLE "dp_doom"
|
#define DOOM_EXECUTABLE "dp_doom"
|
||||||
|
|
||||||
|
#if defined(__FREEBSD__)
|
||||||
|
extern char **environ;
|
||||||
|
char **__environ = environ;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
void spawn_doom_posix_spawn(ControllerContext &ctx)
|
void spawn_doom_posix_spawn(ControllerContext &ctx)
|
||||||
{
|
{
|
||||||
(void) ctx;
|
(void) ctx;
|
||||||
|
|
|
@ -81,6 +81,10 @@ boolean NetListen (void);
|
||||||
// NETWORKING
|
// NETWORKING
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#ifndef IPPORT_USERRESERVED
|
||||||
|
#define IPPORT_USERRESERVED 5000
|
||||||
|
#endif
|
||||||
|
|
||||||
int DOOMPORT = (IPPORT_USERRESERVED +0x1d );
|
int DOOMPORT = (IPPORT_USERRESERVED +0x1d );
|
||||||
|
|
||||||
int sendsocket;
|
int sendsocket;
|
||||||
|
|
Loading…
Reference in a new issue