mirror of
				https://github.com/alterware/master-server.git
				synced 2025-10-30 16:36:56 +00:00 
			
		
		
		
	build: add back x64 macos build
This commit is contained in:
		
							
								
								
									
										1
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @@ -139,6 +139,7 @@ jobs: | ||||
|           - debug | ||||
|           - release | ||||
|         arch: | ||||
|           - x64 | ||||
|           - arm64 | ||||
|     steps: | ||||
|       - name: Check out files | ||||
|   | ||||
							
								
								
									
										26
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								README.md
									
									
									
									
									
								
							| @@ -11,6 +11,29 @@ Run using [Docker][docker-link] | ||||
| docker run -p 20810:20810/udp -e AW_STATS_LOCATION=<UTF-8 C-string> alterware/master-server:latest | ||||
| ``` | ||||
|  | ||||
| or run as a systemd service | ||||
|  | ||||
| ``` | ||||
| [Unit] | ||||
| Description=AlterWare Master Server | ||||
| After=network.target | ||||
|  | ||||
| [Service] | ||||
| Type=simple | ||||
| ExecStart=<working dir>/alterware-master | ||||
| WorkingDirectory=<working dir> | ||||
| Environment="AW_STATS_LOCATION=/var/www/<domain name>/html/stats.json" | ||||
| StandardOutput=null | ||||
| Restart=on-failure | ||||
| RestartSec=10 | ||||
| KillMode=process | ||||
| User=<username> | ||||
| Group=<group name> | ||||
|  | ||||
| [Install] | ||||
| WantedBy=multi-user.target | ||||
| ``` | ||||
|  | ||||
| ## Build | ||||
| - Install [Premake5][premake5-link] and add it to your system PATH | ||||
| - Clone this repository using [Git][git-link] | ||||
| @@ -23,10 +46,9 @@ Requirements for Unix systems: | ||||
| - Dependencies: Ensure the LLVM C++ Standard library is installed | ||||
| - Alternative compilers: If you opt for a different compiler such as GCC, use the [Mold][mold-link] linker | ||||
| - Customization: Modifications to the Premake5.lua script may be required | ||||
| - Platform support: Details regarding supported platforms are available in [build.yml][build-link] | ||||
| - Platform support: Details regarding supported platforms are available in [build.yml](.github/workflows/build.yml). Linux ARM64 should be supported out of the box even if it's not present in the CI scripts | ||||
|  | ||||
| [docker-link]:            https://www.docker.com | ||||
| [premake5-link]:          https://premake.github.io | ||||
| [git-link]:               https://git-scm.com | ||||
| [mold-link]:              https://github.com/rui314/mold | ||||
| [build-link]:             https://github.com/alterware/master-server/blob/master/.github/workflows/build.yml | ||||
|   | ||||
							
								
								
									
										14
									
								
								deps/premake/libtomcrypt.lua
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								deps/premake/libtomcrypt.lua
									
									
									
									
										vendored
									
									
								
							| @@ -56,15 +56,13 @@ function libtomcrypt.project() | ||||
| 			"_USRDLL", | ||||
| 		} | ||||
|  | ||||
| 		if os.istarget("darwin") then | ||||
| 			filter "platforms:x64" | ||||
| 				buildoptions "-march=native" | ||||
| 			filter {} | ||||
| 		filter { "system:macosx", "platforms:arm64" } | ||||
| 			buildoptions "-mcpu=apple-m1" | ||||
| 		filter {} | ||||
|  | ||||
| 			filter "platforms:arm64" | ||||
| 				buildoptions "-mcpu=apple-m1" | ||||
| 			filter {} | ||||
| 		end | ||||
| 		filter { "system:macosx", "platforms:x64" } | ||||
| 			buildoptions "-mcpu=x86-64" | ||||
| 		filter {} | ||||
|  | ||||
| 		warnings "Off" | ||||
| 		kind "StaticLib" | ||||
|   | ||||
| @@ -85,6 +85,11 @@ if os.istarget("linux") then | ||||
| 	filter {} | ||||
| end | ||||
|  | ||||
| filter { "system:macosx", "platforms:x64" } | ||||
| 	buildoptions "-arch x86_64" | ||||
| 	linkoptions "-arch x86_64" | ||||
| filter {} | ||||
|  | ||||
| filter { "system:macosx", "platforms:arm64" } | ||||
| 	buildoptions "-arch arm64" | ||||
| 	linkoptions "-arch arm64" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user