From 2b37a477ce0431cbffe3d61c7beddd4797be349b Mon Sep 17 00:00:00 2001 From: TheCreeper Date: Thu, 15 Dec 2016 01:51:01 +0000 Subject: [PATCH 1/5] Fix compiling issues with the updated hl2sdk-sdk2013 branch --- src/makefiles/linux/linux.base.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/makefiles/linux/linux.base.cmake b/src/makefiles/linux/linux.base.cmake index 96ce0a492..83e15f7bf 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" OR 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") # ------------------------------------------------------------------ From f777680a9e001c1665516a0edb1020424dbe1132 Mon Sep 17 00:00:00 2001 From: TheCreeper Date: Thu, 15 Dec 2016 03:17:38 +0000 Subject: [PATCH 2/5] Fix issue with keyvalues_wrap not compiling with sdk2013 --- src/core/modules/keyvalues/keyvalues_wrap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, From dce972bb365cb5deaf91f5a3accb4c58ae1f41d8 Mon Sep 17 00:00:00 2001 From: TheCreeper Date: Thu, 15 Dec 2016 03:40:54 +0000 Subject: [PATCH 3/5] whoops --- src/makefiles/linux/linux.base.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/makefiles/linux/linux.base.cmake b/src/makefiles/linux/linux.base.cmake index 83e15f7bf..50acd596d 100644 --- a/src/makefiles/linux/linux.base.cmake +++ b/src/makefiles/linux/linux.base.cmake @@ -101,7 +101,7 @@ if(SOURCE_ENGINE MATCHES "orangebox" OR SOURCE_ENGINE MATCHES "bms" OR SOURCE_EN Endif() # Function alias -If(NOT SOURCE_ENGINE MATCHES "bms" OR NOT SOURCE_ENGINE MATCHES "sdk2013") +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") From e5a6f3d9a0c81028aed0c0488edd8b367c5fe33d Mon Sep 17 00:00:00 2001 From: TheCreeper Date: Thu, 15 Dec 2016 03:41:56 +0000 Subject: [PATCH 4/5] This would resolve an issue with the wrong inteface being defined. --- src/makefiles/branch/sdk2013.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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) From 61bd09435058e8d3fe45f6592a9a2e6d6a93a2fa Mon Sep 17 00:00:00 2001 From: TheCreeper Date: Thu, 15 Dec 2016 03:45:28 +0000 Subject: [PATCH 5/5] Include the KeyValues header file instead. There are some things in KeyValues.cpp that are not supported in c++11 --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ) # ------------------------------------------------------------------ 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