RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-03-03 18:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cmake-q3map2' into 'master'

Browse Source 
all: compile q3map2 using cmake

See merge request xonotic/xonotic!45
This commit is contained in:
Rudolf Polzer 2019-10-11 16:43:37 +00:00
commit b21867380b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/tools/all/xonotic.subr
View File

@ -8,9 +8,10 @@ case "$cmd" in
msg "Usage: ./all compile-map mapname1 mapname2 mapname3" msg "Usage: ./all compile-map mapname1 mapname2 mapname3"
msg "For example: ./all compile-map dance xoylent" msg "For example: ./all compile-map dance xoylent"
fi fi
if ! [ -f "netradiant/install/q3map2" ] ; then if ! [ -f "netradiant/build/q3map2" ] ; then
msg "q3map2 needed! Building netradiant..." msg "q3map2 needed! Building q3map2..."
make -C netradiant BUILD=native install/q3map2 cmake -H'netradiant' -B'netradiant/build' -G'Unix Makefiles' -D'CMAKE_BUILD_TYPE=Release' -DBUILD_RADIANT=OFF -DDOWNLOAD_GAMEPACKS=OFF
cmake --build 'netradiant/build' -- q3map2
fi fi
for mapfile in "$@"; do for mapfile in "$@"; do
mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map" mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map"

2
misc/tools/xonotic-map-compiler
View File

@ -11,7 +11,7 @@ use File::Temp;
# Path to Xonotic (where the data directory is in) # Path to Xonotic (where the data directory is in)
our $XONOTICDIR = getcwd(); our $XONOTICDIR = getcwd();
# Path to your q3map2 program. You find it in your GtkRadiant/install # Path to your q3map2 program. You find it in your netradiant/build
# directory. # directory.
our $Q3MAP2 = getcwd() . '/netradiant/build/q3map2'; our $Q3MAP2 = getcwd() . '/netradiant/build/q3map2';