diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9f707c686..7b48606bb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -277,7 +277,7 @@ Set(SOURCEPYTHON_KEYVALUES_MODULE_HEADERS Set(SOURCEPYTHON_KEYVALUES_MODULE_SOURCES core/modules/keyvalues/keyvalues_wrap.cpp - ${SOURCESDK}/tier1/KeyValues.cpp + ${SOURCESDK}/public/tier1/KeyValues.h ) # ------------------------------------------------------------------ diff --git a/src/core/modules/keyvalues/keyvalues_wrap.cpp b/src/core/modules/keyvalues/keyvalues_wrap.cpp index acfa24cff..df18b1905 100644 --- a/src/core/modules/keyvalues/keyvalues_wrap.cpp +++ b/src/core/modules/keyvalues/keyvalues_wrap.cpp @@ -136,7 +136,7 @@ void export_keyvalues(scope _keyvalues) .add_property("next_key", make_function( - &KeyValues::GetNextKey, + GET_METHOD(KeyValues *, KeyValues, GetNextKey, void), reference_existing_object_policy() ), &KeyValues::SetNextKey, diff --git a/src/makefiles/branch/sdk2013.cmake b/src/makefiles/branch/sdk2013.cmake index 8af6164bf..59edf51fa 100644 --- a/src/makefiles/branch/sdk2013.cmake +++ b/src/makefiles/branch/sdk2013.cmake @@ -3,8 +3,11 @@ # Purpose: This is the CMake file for the sdk2013 branch. # ------------------------------------------------------------------ +Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \ +-DINTERFACEVERSION_SERVERGAMEDLL=\"ServerGameDLL010\"") + # ------------------------------------------------------------------ # Set the engine version. # ------------------------------------------------------------------ Set(SOURCE_ENGINE "sdk2013") -add_definitions(-DENGINE_SDK2013) \ No newline at end of file +add_definitions(-DENGINE_SDK2013) diff --git a/src/makefiles/linux/linux.base.cmake b/src/makefiles/linux/linux.base.cmake index 96ce0a492..50acd596d 100644 --- a/src/makefiles/linux/linux.base.cmake +++ b/src/makefiles/linux/linux.base.cmake @@ -42,7 +42,7 @@ Set(SOURCEPYTHON_LINK_LIBRARIES ) -If(SOURCE_ENGINE MATCHES "bms") +If(SOURCE_ENGINE MATCHES "bms" OR SOURCE_ENGINE MATCHES "sdk2013") Set(SOURCEPYTHON_LINK_LIBRARIES "${SOURCEPYTHON_LINK_LIBRARIES}" ${SOURCESDK_LIB}/public/linux32/mathlib.a @@ -96,12 +96,12 @@ EndIf() # General definitions Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LINUX -DPOSIX -DLINUX -DGNUC -DCOMPILER_GCC") -if(SOURCE_ENGINE MATCHES "orangebox" OR SOURCE_ENGINE MATCHES "bms") +if(SOURCE_ENGINE MATCHES "orangebox" OR SOURCE_ENGINE MATCHES "bms" OR SOURCE_ENGINE MATCHES "sdk2013") Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNO_MALLOC_OVERRIDE") Endif() # Function alias -If(NOT SOURCE_ENGINE MATCHES "bms") +If(NOT SOURCE_ENGINE MATCHES "bms" AND NOT SOURCE_ENGINE MATCHES "sdk2013") Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp") Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dstrnicmp=strncasecmp -D_snprintf=snprintf") Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp") @@ -115,7 +115,7 @@ Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -Wno-reorder") # Others Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse -msse -m32 -fno-strict-aliasing") -Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fno-threadsafe-statics -v -fvisibility=hidden") +Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -static-libgcc -static-libstdc++ -fno-threadsafe-statics -v -fvisibility=hidden") # ------------------------------------------------------------------ pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy