Merge pull request #34 from danielga/update-azure-pipelines-config-and-premake

Update Azure Pipelines config and premake5 script

Author: danielga

azure-pipelines.yml

@@ -6,12 +6,7 @@ variables:
   GARRYSMOD_COMMON_REPOSITORY: https://github.com/danielga/garrysmod_common.git
   PROJECT_GENERATOR_VERSION: 2
   REPOSITORY_DIR: $(System.DefaultWorkingDirectory)
-  TARGET_ARCHITECTURE: x86
-  TARGET_ARCHITECTURE_64: x86_64
   DISABLE_X86_64_BUILD: true
-  SOURCE_SDK: $(System.DefaultWorkingDirectory)/dependencies/sourcesdk-minimal
-  SOURCE_SDK_BRANCH: master
-  SOURCE_SDK_REPOSITORY: https://github.com/danielga/sourcesdk-minimal.git
 trigger:
   tags:
     include:
@@ -26,11 +21,8 @@ jobs:
   variables:
     BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.ps1
     BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.ps1
-    TARGET_OS: win32
-    TARGET_OS_64: win64
     COMPILER_PLATFORM: vs2019
     PROJECT_OS: windows
-    PREMAKE5_EXECUTABLE: premake5.exe
     PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/windows/premake-core/premake5.exe
     PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-windows.zip
   steps:
@@ -60,14 +52,15 @@ jobs:
   variables:
     BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.sh
     BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.sh
-    TARGET_OS: linux
-    TARGET_OS_64: linux64
     COMPILER_PLATFORM: gmake
     PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/linux/premake-core/premake5
     PROJECT_OS: linux
     PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-linux.tar.gz
     CC: gcc-9
     CXX: g++-9
+    AR: gcc-ar-9
+    NM: gcc-nm-9
+    RANLIB: gcc-ranlib-9
   steps:
   - bash: 'curl -s -L "$BOOTSTRAP_URL" | bash'
     displayName: Bootstrap
@@ -97,8 +90,6 @@ jobs:
   variables:
     BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.sh
     BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.sh
-    TARGET_OS: osx
-    TARGET_OS_64: osx64
     COMPILER_PLATFORM: gmake
     PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/macosx/premake-core/premake5
     PROJECT_OS: macosx

premake5.lua

@@ -6,17 +6,10 @@ newoption({
 
 local gmcommon = assert(_OPTIONS.gmcommon or os.getenv("GARRYSMOD_COMMON"),
 	"you didn't provide a path to your garrysmod_common (https://github.com/danielga/garrysmod_common) directory")
-include(path.join(gmcommon, "generator.v2.lua"))
+include(gmcommon .. "/generator.v2.lua")
 
 CreateWorkspace({name = "luaerror", abi_compatible = true})
 	CreateProject({serverside = true, manual_files = true})
-		files({
-			"source/main.cpp",
-			"source/server.cpp",
-			"source/server.hpp",
-			"source/shared.cpp",
-			"source/shared.hpp"
-		})
 		IncludeLuaShared()
 		IncludeHelpersExtended()
 		IncludeSDKCommon()
@@ -25,15 +18,24 @@ CreateWorkspace({name = "luaerror", abi_compatible = true})
 		IncludeScanning()
 		IncludeDetouring()
 
-	CreateProject({serverside = false, manual_files = true})
 		files({
 			"source/main.cpp",
+			"source/server.cpp",
+			"source/server.hpp",
 			"source/shared.cpp",
 			"source/shared.hpp"
 		})
+
+	CreateProject({serverside = false, manual_files = true})
 		IncludeLuaShared()
 		IncludeHelpersExtended()
 		IncludeSDKCommon()
 		IncludeSDKTier0()
 		IncludeSDKTier1()
 		IncludeScanning()
+
+		files({
+			"source/main.cpp",
+			"source/shared.cpp",
+			"source/shared.hpp"
+		})

source/main.cpp

@@ -12,11 +12,11 @@ GMOD_MODULE_OPEN( )
 {
 	LUA->CreateTable( );
 
-	LUA->PushString( "luaerror 1.5.3" );
+	LUA->PushString( "luaerror 1.5.4" );
 	LUA->SetField( -2, "Version" );
 
 	// version num follows LuaJIT style, xxyyzz
-	LUA->PushNumber( 10503 );
+	LUA->PushNumber( 10504 );
 	LUA->SetField( -2, "VersionNum" );
 
 #if defined LUAERROR_SERVER

source/server.cpp

@@ -143,7 +143,7 @@ void Initialize( GarrysMod::Lua::ILuaBase *LUA )
 	if( engine == nullptr )
 		LUA->ThrowError( "failed to retrieve server engine interface" );
 
-	const auto HandleClientLuaError = FunctionPointers::HandleClientLuaError( );
+	const auto HandleClientLuaError = FunctionPointers::CBasePlayer_HandleClientLuaError( );
 	if( HandleClientLuaError == nullptr )
 		LUA->ThrowError( "unable to sigscan function HandleClientLuaError" );