mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 01:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set default workspace instead of requiring outpath

Browse Source 
This uses ./build/workspaces/default as location for generated build
files as well as build products. Using the name "default" to avoid the
dilemma gcc vs clang vs premake generator. Doesn't impact scripts
already using --outpath and allows running premake5 --help without a
wrapper.

Also update .gitignore to make using arbitrary workspaces cleaner.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser
2024-11-25 19:57:13 +01:00
parent cb08933e88
commit a5fec576f9
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+4 -7
View File
@@ -4,13 +4,10 @@ binaries/system/*
!binaries/system/readme.txt !binaries/system/readme.txt
# Workspaces # Workspaces
build/workspaces/codeblocks/ build/workspaces
build/workspaces/gcc/ !build/workspaces/clean-workspaces.sh
build/workspaces/xcode3/ !build/workspaces/update-workspaces.bat
build/workspaces/xcode4/ !build/workspaces/update-workspaces.sh
build/workspaces/vc2013
build/workspaces/vc2015
build/workspaces/vs2017
# Libraries # Libraries
libraries/macos libraries/macos
build/premake/premake5.lua
+1 -4
View File
@@ -5,7 +5,7 @@ newoption { trigger = "gles", description = "Use non-working OpenGL ES 2.0 mode"
newoption { trigger = "icc", description = "Use Intel C++ Compiler (Linux only; should use either \"--cc icc\" or --without-pch too, and then set CXX=icpc before calling make)" } newoption { trigger = "icc", description = "Use Intel C++ Compiler (Linux only; should use either \"--cc icc\" or --without-pch too, and then set CXX=icpc before calling make)" }
newoption { trigger = "jenkins-tests", description = "Configure CxxTest to use the XmlPrinter runner which produces Jenkins-compatible output" } newoption { trigger = "jenkins-tests", description = "Configure CxxTest to use the XmlPrinter runner which produces Jenkins-compatible output" }
newoption { trigger = "minimal-flags", description = "Only set compiler/linker flags that are really needed. Has no effect on Windows builds" } newoption { trigger = "minimal-flags", description = "Only set compiler/linker flags that are really needed. Has no effect on Windows builds" }
newoption { trigger = "outpath", description = "Location for generated project files" } newoption { trigger = "outpath", description = "Location for generated project files", default="../workspaces/default" }
newoption { trigger = "with-system-cxxtest", description = "Search standard paths for cxxtest, instead of using bundled copy" } newoption { trigger = "with-system-cxxtest", description = "Search standard paths for cxxtest, instead of using bundled copy" }
newoption { trigger = "with-lto", description = "Enable Link Time Optimization (LTO)" } newoption { trigger = "with-lto", description = "Enable Link Time Optimization (LTO)" }
newoption { trigger = "with-system-mozjs", description = "Search standard paths for libmozjs91, instead of using bundled copy" } newoption { trigger = "with-system-mozjs", description = "Search standard paths for libmozjs91, instead of using bundled copy" }
@@ -121,9 +121,6 @@ end
workspace "pyrogenesis" workspace "pyrogenesis"
targetdir(rootdir.."/binaries/system") targetdir(rootdir.."/binaries/system")
libdirs(rootdir.."/binaries/system") libdirs(rootdir.."/binaries/system")
if not _OPTIONS["outpath"] then
error("You must specify the 'outpath' parameter")
end
location(_OPTIONS["outpath"]) location(_OPTIONS["outpath"])
configurations { "Release", "Debug" } configurations { "Release", "Debug" }