Skip to content

Commit 0286827

Browse files
committed
Update README and Azure Pipelines config
1 parent 82abf1b commit 0286827

File tree

2 files changed

+20
-26
lines changed

2 files changed

+20
-26
lines changed

azure-pipelines.yml

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ variables:
66
GARRYSMOD_COMMON_REPOSITORY: https://github.com/danielga/garrysmod_common.git
77
PROJECT_GENERATOR_VERSION: 2
88
REPOSITORY_DIR: $(System.DefaultWorkingDirectory)
9-
TARGET_ARCHITECTURE: x86
10-
TARGET_ARCHITECTURE_64: x86_64
119
DISABLE_X86_64_BUILD: true
12-
SOURCE_SDK: $(System.DefaultWorkingDirectory)/dependencies/sourcesdk-minimal
13-
SOURCE_SDK_BRANCH: master
14-
SOURCE_SDK_REPOSITORY: https://github.com/danielga/sourcesdk-minimal.git
1510
trigger:
1611
tags:
1712
include:
@@ -26,13 +21,10 @@ jobs:
2621
variables:
2722
BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.ps1
2823
BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.ps1
29-
TARGET_OS: win32
30-
TARGET_OS_64: win64
3124
COMPILER_PLATFORM: vs2019
3225
PROJECT_OS: windows
33-
PREMAKE5_EXECUTABLE: premake5.exe
3426
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/windows/premake-core/premake5.exe
35-
PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha14/premake-5.0.0-alpha14-windows.zip
27+
PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-windows.zip
3628
steps:
3729
- powershell: 'Invoke-Expression ((New-Object System.Net.WebClient).DownloadString("$env:BOOTSTRAP_URL"))'
3830
displayName: Bootstrap
@@ -55,24 +47,25 @@ jobs:
5547
displayName: Linux
5648
pool:
5749
name: Azure Pipelines
58-
vmImage: ubuntu-18.04
50+
vmImage: ubuntu-16.04
5951
timeoutInMinutes: 10
6052
variables:
6153
BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.sh
6254
BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.sh
63-
TARGET_OS: linux
64-
TARGET_OS_64: linux64
6555
COMPILER_PLATFORM: gmake
6656
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/linux/premake-core/premake5
6757
PROJECT_OS: linux
68-
PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha14/premake-5.0.0-alpha14-linux.tar.gz
69-
CC: gcc-8
70-
CXX: g++-8
58+
PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-linux.tar.gz
59+
CC: gcc-9
60+
CXX: g++-9
61+
AR: gcc-ar-9
62+
NM: gcc-nm-9
63+
RANLIB: gcc-ranlib-9
7164
steps:
7265
- bash: 'curl -s -L "$BOOTSTRAP_URL" | bash'
7366
displayName: Bootstrap
7467
- bash: |
75-
sudo apt-get update && sudo apt-get install -y g++-8-multilib
68+
sudo apt-get update && sudo apt-get install -y g++-9-multilib
7669
$BUILD_SCRIPT
7770
displayName: Build
7871
- task: CopyFiles@2
@@ -92,22 +85,23 @@ jobs:
9285
displayName: macOS
9386
pool:
9487
name: Azure Pipelines
95-
vmImage: macOS-10.13
88+
vmImage: macOS-10.15
9689
timeoutInMinutes: 10
9790
variables:
9891
BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.sh
9992
BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.sh
100-
TARGET_OS: osx
101-
TARGET_OS_64: osx64
10293
COMPILER_PLATFORM: gmake
10394
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/macosx/premake-core/premake5
10495
PROJECT_OS: macosx
105-
PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha14/premake-5.0.0-alpha14-macosx.tar.gz
96+
PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-macosx.tar.gz
97+
MACOSX_SDK_URL: https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.7.sdk.tar.xz
98+
MACOSX_SDK_DIRECTORY: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk
99+
SDKROOT: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk
106100
steps:
107101
- bash: 'curl -s -L "$BOOTSTRAP_URL" | bash'
108102
displayName: Bootstrap
109103
- bash: |
110-
sudo xcode-select -s "/Applications/Xcode_9.4.1.app/Contents/Developer"
104+
sudo xcode-select -s "/Applications/Xcode_11.4.1.app/Contents/Developer"
111105
$BUILD_SCRIPT
112106
displayName: Build
113107
- task: CopyFiles@2

readme.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ A module for Garry's Mod that provides interfaces to many systems of VALVe's eng
55

66
## Compiling
77

8-
The only supported compilation platform for this project on Windows is **Visual Studio 2017** on **release** mode.
8+
The only supported compilation platforms for this project on Windows are **Visual Studio 2015**, **Visual Studio 2017** and **Visual Studio 2019** on **release** mode.
99
On Linux, everything should work fine as is, on **release** mode.
10-
For Mac OSX, any **Xcode (using the GCC compiler)** version *MIGHT* work as long as the **Mac OSX 10.7 SDK** is used, on **release** mode.
10+
For Mac OSX, any **Xcode version (using the GCC compiler)** *MIGHT* work as long as the **Mac OSX 10.7 SDK** is used, on **release** mode.
1111
These restrictions are not random; they exist because of ABI compatibility reasons.
12-
If stuff starts erroring or fails to work, be sure to check the correct line endings (\n and such) are present in the files for each OS.
12+
If stuff starts erroring or fails to work, be sure to check the correct line endings (`\n` and such) are present in the files for each OS.
1313

1414
## Requirements
1515

16-
This project requires [garrysmod\_common][2], a framework to facilitate the creation of compilations files (Visual Studio, make, XCode, etc). Simply set the environment variable '**GARRYSMOD\_COMMON**' or the premake option '**gmcommon**' to the path of your local copy of [garrysmod\_common][2].
17-
We also use [SourceSDK2013][3], so set the environment variable '**SOURCE\_SDK**' or the premake option '**sourcesdk**' to the path of your local copy of [SourceSDK2013][3]. The previous links to [SourceSDK2013][3] point to my own fork of VALVe's repo and for good reason: Garry's Mod has lots of backwards incompatible changes to interfaces and it's much smaller, being perfect for automated build systems like Travis-CI.
16+
This project requires [garrysmod_common][2], a framework to facilitate the creation of compilations files (Visual Studio, make, XCode, etc). Simply set the environment variable `GARRYSMOD_COMMON` or the premake option `--gmcommon=path` to the path of your local copy of [garrysmod_common][2].
17+
We also use [SourceSDK2013][3]. The previous links to [SourceSDK2013][3] point to my own fork of VALVe's repo and for good reason: Garry's Mod has lots of backwards incompatible changes to interfaces and it's much smaller, being perfect for automated build systems like Azure Pipelines (which is used for this project).
1818

1919
[1]: https://github.com/AlexSwift/GMod13-Modules/tree/master/gm_sourcenet3
2020
[2]: https://github.com/danielga/garrysmod_common

0 commit comments

Comments
 (0)