Updated Makefile for compatibility & optimisations

.github/workflows/build.yml

@@ -0,0 +1,114 @@
+name: Build
+
+on: ["push", "workflow_dispatch"]
+
+jobs:
+  build_main:
+    name: Build for ${{ matrix.os_short }}
+    runs-on: ${{ matrix.os_version }}
+
+    # skip build on '[ci skip]'
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-22.04
+          - windows-x32
+        include:
+          - os: ubuntu-22.04
+            os_short: linux
+            os_version: ubuntu-22.04
+            package_ext: tar.gz
+            dbg_ext: dbg
+            cc: clang
+            cxx: clang++
+            vs_arch: unused
+            am_arch: x86
+
+          - os: windows-x32
+            os_short: win32
+            os_version: windows-latest
+            package_ext: zip
+            dbg_ext: pdb
+            cc: not-used
+            cxx: not-used
+            vs_arch: x32
+            am_arch: x86
+
+
+    steps:
+    - name: Install (Linux)
+      if: runner.os == 'Linux'
+      run: |
+        sudo dpkg --add-architecture i386
+        sudo apt-get update
+        sudo apt-get install -y clang g++-multilib
+        echo "CC=clang" >> $GITHUB_ENV
+        echo "CXX=clang++" >> $GITHUB_ENV
+
+    - name: Add msbuild to PATH (Windows)
+      if: runner.os == 'Windows'
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Install (Windows)
+      if: runner.os == 'Windows'
+      shell: cmd
+      run: |
+        :: See https://github.com/microsoft/vswhere/wiki/Find-VC
+        for /f "usebackq delims=*" %%i in (`vswhere -latest -property installationPath`) do (
+          call "%%i"\Common7\Tools\vsdevcmd.bat -arch=${{ matrix.vs_arch }} -host_arch=x64
+        )
+
+        :: Loop over all environment variables and make them global.
+        for /f "delims== tokens=1,2" %%a in ('set') do (
+          echo>>"%GITHUB_ENV%" %%a=%%b
+        )
+
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
+    - name: Setup ambuild
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install wheel
+        pip install git+https://github.com/alliedmodders/ambuild
+
+    - name: Fetch RealBot
+      uses: actions/checkout@v4
+      with:
+        path: realbot
+        submodules: recursive
+
+    - name: Build Files
+      shell: bash
+      working-directory: realbot
+      run: |
+        mkdir post
+        cd post
+
+        export AM_ARCH=${{ matrix.am_arch }}
+
+        python3 ../configure.py --symbol-files --enable-optimize
+
+        ambuild
+
+    - uses: benjlevesque/short-sha@v2.2
+      id: short-sha
+
+    - name: Upload Binary
+      uses: actions/upload-artifact@v4
+      with:
+        name: realbot-${{ matrix.os_short }}-${{ steps.short-sha.outputs.sha }}
+        path: |
+            realbot/post/*
+
+    - name: Upload Debug Symbols
+      uses: actions/upload-artifact@v4
+      with:
+        name: realbot-dbgsym-${{ matrix.os_short }}-${{ steps.short-sha.outputs.sha }}
+        path: |
+            realbot/post/**/*.${{ matrix.dbg_ext }}

.gitignore

@@ -18,6 +18,7 @@
 x64/
 x86/
 build/
+build_linux/
 bld/
 [Bb]in/
 [Oo]bj/
@@ -216,3 +217,5 @@ CMakeLists.txt
 cmake-build-debug/
 
 *.o
+realbot_mm.so
+apg-load

AMBuildScript

@@ -0,0 +1,161 @@
+# AMBuildScript for RealBot, written by Anonymous Player
+# vim: set sts=4 ts=8 sw=4 tw=99 et ft=python:
+import os, sys
+
+builder.cxx = builder.DetectCxx(target_arch = 'x86')
+
+# Include search paths
+include_paths = [
+  os.path.join(builder.currentSourcePath, 'dependencies', 'metamod-hl1', 'metamod'),
+  os.path.join(builder.currentSourcePath, 'dependencies', 'hlsdk', 'common'),
+  os.path.join(builder.currentSourcePath, 'dependencies', 'hlsdk', 'public'),
+  os.path.join(builder.currentSourcePath, 'dependencies', 'hlsdk', 'dlls'),
+  os.path.join(builder.currentSourcePath, 'dependencies', 'hlsdk', 'engine'),
+  os.path.join(builder.currentSourcePath, 'dependencies', 'hlsdk', 'game_shared'),
+  os.path.join(builder.currentSourcePath, 'dependencies', 'hlsdk', 'pm_shared'),
+]
+
+# Compiler setup
+builder.cxx.defines += [
+    'HAVE_STDINT_H',
+  ]
+
+if builder.cxx.like('gcc'):
+  builder.cxx.defines += [
+    'stricmp=strcasecmp',
+    'strcmpi=strcasecmp'
+  ]
+
+  builder.cxx.c_only_flags += ['-std=gnu99']
+if builder.cxx.target.platform == 'linux':
+  # Linux defines
+  builder.cxx.defines += ['_LINUX', 'POSIX', 'LINUX', 'linux']
+  # Linux compiler C flags
+  builder.cxx.cflags += [
+    '-mtune=generic',
+    '-pipe',
+    '-fPIC',
+    '-msse4.2',
+    '-mfpmath=sse',
+    '-fno-strict-aliasing',
+    '-Wall',
+    '-Werror',
+    '-Wno-uninitialized',
+    '-Wno-unused',
+    '-Wno-switch',
+    '-Wno-format',
+    '-Wno-format-security',
+    '-Wno-unknown-attributes',
+    '-Wno-logical-op-parentheses',
+    '-Wno-return-stack-address',
+    '-m32',
+  ]
+  # Linux compiler C++ flags
+  builder.cxx.cxxflags += [
+    '-Wno-invalid-offsetof',
+    '-Wno-write-strings',
+    '-std=c++17',
+  ]
+  # Linux linker flags
+  builder.cxx.linkflags += ['-m32', '-ldl', '-lm', '-flto']
+elif builder.cxx.target.platform == 'windows':
+  # Windows defines
+  builder.cxx.defines += [
+    '_CRT_SECURE_NO_DEPRECATE',
+    '_CRT_SECURE_NO_WARNINGS',
+    '_CRT_NONSTDC_NO_DEPRECATE',
+    'NOMINMAX',
+    'WIN32',
+    '_WINDOWS'
+  ]
+  # Windows compiler C flags
+  builder.cxx.cflags += []
+  # Windows compiler C++ flags
+  builder.cxx.cxxflags += [
+    '/std:c++17',
+    '/arch:SSE2',
+    '/fp:precise',
+    '/Qspectre',
+    '/EHsc'
+  ]
+  # Windows linker flags
+  builder.cxx.linkflags += [
+    '/EXPORT:GiveFnptrsToDll=_GiveFnptrsToDll@8,@1',
+    '/SECTION:.data,RW',
+    '/MACHINE:X86'
+  ]
+
+# Compiler options for optimization ( --enable-optimize )
+if builder.options.optimize:
+  # Shared optimization definitions
+  builder.cxx.defines += ['NDEBUG']
+  if builder.cxx.target.platform == 'linux':
+    # Linux optimization flags
+    builder.cxx.cflags += ['-O3']
+	# Linux optimization link flags #TODO
+	#builder.cxx.linkflags += ['-flto']
+  elif builder.cxx.target.platform == 'windows':
+    # Windows optimization flags - /Ob3 needs to be after /Ox, enables aggressive function inling -caxanga334
+    builder.cxx.cflags += ['/Ox', '/Zo', '/Ob3', '/GL']
+    # Windows optimization link flags
+    builder.cxx.linkflags += ['/OPT:ICF', '/OPT:REF', '/LTCG']
+    # This needs to be after our optimization flags which could otherwise disable it.
+    builder.cxx.cflags += ['/Oy-']
+
+# Compiler options for debugging ( --enable-debug )
+if builder.options.debug:
+  # Shared debug definitions
+  builder.cxx.defines += ['DEBUG', '_DEBUG']
+  if builder.cxx.target.platform == 'linux':
+    # Linux debug flags
+    builder.cxx.cflags += ['-g3', '-Og', '-ggdb3']
+  elif builder.cxx.target.platform == 'windows':
+    # Windows debug flags
+    builder.cxx.cflags += ['/Od', '/RTC1', '/MTd']
+    # Windows debug link flags
+    builder.cxx.linkflags += ['/NODEFAULTLIB:libcmt']
+
+# Handle --enable-static-lib and --enable-shared-lib
+if builder.cxx.target.platform == 'linux':
+  if builder.options.staticlib == '1':
+    builder.cxx.linkflags += [
+      '-static-libgcc',
+      '-static-libstdc++'
+    ]
+  elif builder.options.sharedlib == '1':
+    builder.cxx.linkflags += [
+      '-shared-libgcc',
+    ]
+
+library = builder.cxx.Library('realbot_mm')
+
+library.compiler.includes += include_paths
+
+library.sources += [
+  'bot.cpp',
+  'bot_buycode.cpp',
+  'bot_client.cpp',
+  'bot_func.cpp',
+  'bot_navigate.cpp',
+  'build.cpp',
+  'ChatEngine.cpp',
+  'dll.cpp',
+  'engine.cpp',
+  'game.cpp',
+  'IniParser.cpp',
+  'NodeMachine.cpp',
+  'util.cpp',
+]
+
+#builder.RunBuildScripts(
+#  [
+#    'Bsp2Rbn/AMBuilder',
+#  ],
+#  #{ 'AMXX': AMXX }
+#)
+
+#
+# Run scripts, add binaries
+#
+
+builder.Add(library)

Bsp2Rbn/AMBuilder

@@ -0,0 +1,24 @@
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
+import os.path
+
+#binary = AMXX.MetaModule(builder, 'bsp2rbn')
+
+binary.sources = [
+  '../../public/sdk/amxxmodule.cpp',
+  'CRank.cpp',
+  'CMisc.cpp',
+  'NBase.cpp',
+  'NRank.cpp',
+  'usermsg.cpp',
+  'Utils.cpp',
+  'moduleconfig.cpp',
+]
+
+if builder.target_platform == 'windows':
+  #binary.sources += ['version.rc']
+  binary.compiler.linkflags += [
+    '/EXPORT:GiveFnptrsToDll=_GiveFnptrsToDll@8,@1',
+    '/SECTION:.data,RW',
+  ]
+
+##AMXX.modules += [builder.Add(binary)]

Bsp2Rbn/Bsp2Rbn.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32414.318
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bsp2Rbn", "Bsp2Rbn.vcxproj", "{85813A68-52FB-4F75-91BA-DD3B6C50FD68}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{85813A68-52FB-4F75-91BA-DD3B6C50FD68}.Debug|x64.ActiveCfg = Debug|x64
+		{85813A68-52FB-4F75-91BA-DD3B6C50FD68}.Debug|x64.Build.0 = Debug|x64
+		{85813A68-52FB-4F75-91BA-DD3B6C50FD68}.Debug|x86.ActiveCfg = Debug|Win32
+		{85813A68-52FB-4F75-91BA-DD3B6C50FD68}.Debug|x86.Build.0 = Debug|Win32
+		{85813A68-52FB-4F75-91BA-DD3B6C50FD68}.Release|x64.ActiveCfg = Release|x64
+		{85813A68-52FB-4F75-91BA-DD3B6C50FD68}.Release|x64.Build.0 = Release|x64
+		{85813A68-52FB-4F75-91BA-DD3B6C50FD68}.Release|x86.ActiveCfg = Release|Win32
+		{85813A68-52FB-4F75-91BA-DD3B6C50FD68}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {E7378DCB-1E54-43A4-B950-59F6E738F898}
+	EndGlobalSection
+EndGlobal