mirror of
https://github.com/YGGverse/hlsdk-portable.git
synced 2025-03-12 13:31:33 +00:00
Merge branch 'master' into theyhunger
This commit is contained in:
commit
22b01a7dca
@ -30,6 +30,7 @@ add_definitions(-DCLIENT_DLL)
|
||||
if(NOT MSVC)
|
||||
add_compile_options(-fno-exceptions) # GCC/Clang flag
|
||||
add_compile_options(-Wno-write-strings) # GCC/Clang flag
|
||||
add_compile_options(-fvisibility=hidden) # GCC/Clang flag
|
||||
add_definitions(-D_LINUX -DLINUX) # It seems enough for all non-Win32 systems
|
||||
add_definitions(-Dstricmp=strcasecmp -Dstrnicmp=strncasecmp)
|
||||
if(NOT MINGW)
|
||||
|
@ -30,13 +30,14 @@ add_definitions(-DCROWBAR_IDLE_ANIM)
|
||||
if(NOT MSVC)
|
||||
add_compile_options(-fno-exceptions) # GCC/Clang flag
|
||||
add_compile_options(-Wno-invalid-offsetof) # GCC/Clang flag
|
||||
add_compile_options(-fvisibility=hidden) # GCC/Clang flag
|
||||
add_definitions(-D_LINUX) # It seems enough for all non-Win32 systems
|
||||
add_definitions(-Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf )
|
||||
else()
|
||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
|
||||
endif()
|
||||
|
||||
set(SVDLL_SOURCES
|
||||
set (SVDLL_SOURCES
|
||||
hunger/ap9.cpp
|
||||
hunger/babykelly.cpp
|
||||
hunger/boss.cpp
|
||||
@ -157,8 +158,13 @@ set(SVDLL_SOURCES
|
||||
../pm_shared/pm_math.c
|
||||
../pm_shared/pm_shared.c
|
||||
)
|
||||
<<<<<<< HEAD
|
||||
|
||||
include_directories (. hunger wpn_shared ../common ../engine ../pm_shared ../game_shared ../public)
|
||||
=======
|
||||
|
||||
include_directories (. wpn_shared ../common ../engine ../pm_shared ../game_shared ../public)
|
||||
>>>>>>> master
|
||||
|
||||
if(USE_VOICEMGR)
|
||||
set(SVDLL_SOURCES
|
||||
|
Loading…
x
Reference in New Issue
Block a user