dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2024-11-23 12:53:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't link against X11 libraries

Browse source 
Not required anymore. All backends use SDL based implementations
now.
This commit is contained in:
dhewg 2011-12-31 16:48:31 +01:00
parent bf69f7ec76
commit 3c90c12605
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
neo/CMakeLists.txt
View file

@ -96,17 +96,6 @@ include_directories(${OPENGL_INCLUDE_DIR})
find_package(SDL REQUIRED) find_package(SDL REQUIRED)
include_directories(${SDL_INCLUDE_DIR}) include_directories(${SDL_INCLUDE_DIR})
if (UNIX AND NOT APPLE)
find_package(X11 REQUIRED)
include_directories(${X11_INCLUDE_DIR})
if (os MATCHES ".*bsd" OR os STREQUAL "dragonfly")
set(Xxf86vm /usr/local/lib/libXxf86vm.so)
else()
set(Xxf86vm Xxf86vm)
endif()
endif()
if (CURL) if (CURL)
find_package(CURL REQUIRED) find_package(CURL REQUIRED)
add_definitions(-DID_ENABLE_CURL=1) add_definitions(-DID_ENABLE_CURL=1)
@ -693,7 +682,6 @@ if (CORE)
set_target_properties(doom3.${cpu} PROPERTIES LINK_FLAGS "${ldflags}") set_target_properties(doom3.${cpu} PROPERTIES LINK_FLAGS "${ldflags}")
target_link_libraries(doom3.${cpu} target_link_libraries(doom3.${cpu}
idlib${cpu} idlib${cpu}
${X11_X11_LIB} ${X11_Xext_LIB} ${Xxf86vm}
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${OPENAL_LIBRARY} ${OPENAL_LIBRARY}
${OGG_LIBRARIES} ${OGG_LIBRARIES}

2
neo/sys/scons/SConscript.core
View file

@ -250,8 +250,6 @@ if (g_os == "Linux"):
if ( local_curl == 1 ): if ( local_curl == 1 ):
local_env.Append( LIBS = [ 'curl', 'z' ] ) local_env.Append( LIBS = [ 'curl', 'z' ] )
if ( local_dedicated == 0 ): if ( local_dedicated == 0 ):
local_env.Append( LIBS = [ 'X11', 'Xext', 'Xxf86vm' ] ) # 'Xxf86dga',
local_env.Append( LIBPATH = [ '/usr/X11R6/lib' ] )
local_env.Append( LIBS = [ 'openal' ] ) local_env.Append( LIBS = [ 'openal' ] )
source_list = core_list source_list = core_list