RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2024-12-15 03:15:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
584 Commits 36 Branches 9 Tags 258 MiB
f29b3346e0
Commit Graph

304 Commits

Author SHA1 Message Date
Rudolf Polzer
f29b3346e0 Merge branch 'master' into divVerent/crypto2 
Conflicts:
	all
 2010-09-25 10:16:25 +02:00
Rudolf Polzer
0e67555016 reordered the repos in ./all in a better order (more in order of priority) 2010-09-25 10:15:37 +02:00
Rudolf Polzer
e98e758c0c turn D3D off again in release builds (and build without C++) 2010-09-24 22:12:08 +02:00
Rudolf Polzer
3b4e66d1b5 compile SDL with the C compiler again 2010-09-24 13:05:56 +02:00
Rudolf Polzer
6826e88c31 Merge branch 'master' into divVerent/crypto2 
Conflicts:
	misc/builddeps/dp.win64/include/d3dtypes.h
	misc/builddeps/dp.win64/include/dsound.h
 2010-09-24 12:50:35 +02:00
Rudolf Polzer
11c90ccf2d properly build as C++ 2010-09-24 12:41:18 +02:00
Rudolf Polzer
2359da7f5c win32: enable D3D9 (win64 not yet, have no working win64 C++ compiler here) 2010-09-24 12:05:38 +02:00
Rudolf Polzer
b656acffe4 better distribute source code 2010-09-24 06:50:10 +02:00
Rudolf Polzer
849728118c fix a stupid find command :) 2010-09-19 21:35:03 +02:00
Rudolf Polzer
24275ffedd Merge remote branch 'origin/master' into divVerent/crypto2 2010-09-19 21:03:03 +02:00
Rudolf Polzer
f3b98d2546 fix ./all clean -f -m 2010-09-18 16:58:48 +02:00
Rudolf Polzer
bd9d5d9962 fix -fU parsing 2010-09-18 13:25:55 +02:00
Rudolf Polzer
2a67f42c77 update help in ./all 2010-09-18 13:24:27 +02:00
Rudolf Polzer
45604a50d9 by default, rm untracked files 2010-09-18 13:17:46 +02:00
Rudolf Polzer
ff0fe7591e reclone: also fetch upstream, this then even can recover from upstream changes 2010-09-18 13:13:43 +02:00
Rudolf Polzer
20c8db330f ./all clean --reclone 2010-09-18 13:09:46 +02:00
Rudolf Polzer
da36e2366a be more verbose 2010-09-18 13:07:46 +02:00
Rudolf Polzer
8fa18b2570 ./all branches: more concise display; ./all clean: allow resetting the repo into pristine state (-m -fu -r -D, meaning "master, force upstream, remove untracked, delete other branches") 2010-09-18 13:03:28 +02:00
Rudolf Polzer
5cc9692968 rename win64 binaries for consistency 2010-09-18 00:08:35 +02:00
Rudolf Polzer
c24f0eb359 Merge branch 'master' into divVerent/crypto2 2010-09-18 00:08:06 +02:00
Rudolf Polzer
0f40d475de we CAN continue to keep these libs in git, we just need to disable them in releases 2010-09-18 00:01:51 +02:00
Rudolf Polzer
25713752e3 Revert "separate out the rijndael libraries", instead doing this PROPERLY in a next commit 
This reverts commit 75241b8410.
 2010-09-18 00:01:03 +02:00
Rudolf Polzer
bcfe4e93fb enable win64 SDL build 2010-09-17 21:20:05 +02:00
Rudolf Polzer
75241b8410 separate out the rijndael libraries 2010-09-17 11:55:38 +02:00
Rudolf Polzer
0241e4415b Merge remote branch 'origin/master' into divVerent/crypto2 2010-09-17 07:37:59 +02:00
Rudolf Polzer
c445176a36 fix another typo 2010-09-17 06:54:31 +02:00
Rudolf Polzer
a1904f5972 work around another problem in 7z's exclude logic 2010-09-16 12:42:38 +02:00
Rudolf Polzer
03cd1c78db do not set +x on exe files 2010-09-16 11:42:48 +02:00
Rudolf Polzer
cda347b55a fix a path error when release building 2010-09-16 10:48:26 +02:00
Rudolf Polzer
ad9d4b2c72 fix 7z/zip decision again :( 2010-09-16 09:04:52 +02:00
Rudolf Polzer
39b629c021 properly distinguish between 7za and zip 2010-09-16 08:41:57 +02:00
Rudolf Polzer
30c8b094e7 use 7zip instead of infozip where possible 2010-09-16 08:30:29 +02:00
Rudolf Polzer
38d6d573ab release build script: run sub-compiles with niceness of calling process 2010-09-15 21:27:23 +02:00
Rudolf Polzer
027aa5398b enable debugging during builds 2010-09-15 13:21:13 +02:00
Rudolf Polzer
08712962ad fix typo 2010-09-15 13:19:50 +02:00
Rudolf Polzer
28a97ea2af new var HOSTS_THAT_ARE_DISABLED 2010-09-15 13:14:23 +02:00
Rudolf Polzer
0a49b6cf7f Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-09-14 06:00:59 +02:00
Rudolf Polzer
ce362bfaad embed versionbuilder into the release build procedure 2010-09-14 05:59:21 +02:00
Rudolf Polzer
5766d4c05a Merge branch 'master' into divVerent/crypto2 
Conflicts:
	all
 2010-09-13 10:34:50 +02:00
Rudolf Polzer
4399289d77 -Wl,--hash-style=sysv not needed or supported on debian etch 
Conflicts:

	all
 2010-09-13 10:28:36 +02:00
Rudolf Polzer
51bbe2c026 release build script: put the dependencies in a better place on the build hosts 
Conflicts:

	all
 2010-09-13 10:27:21 +02:00
Rudolf Polzer
e18fe2ec47 release build script: put the dependencies in a better place on the build hosts 2010-09-13 09:59:12 +02:00
Rudolf Polzer
6e84b60868 make div0-stable compile again 2010-09-11 02:23:41 +02:00
Rudolf Polzer
45bc3de646 Merge branch 'master' into divVerent/crypto2 2010-09-11 02:04:45 +02:00
Rudolf Polzer
7af6dea8b5 enable D3D compilation when running with master 2010-09-11 01:53:37 +02:00
Rudolf Polzer
13a74ed2c1 Merge remote branch 'origin/master' into divVerent/crypto2 2010-09-07 09:34:00 +02:00
Rudolf Polzer
713fc53d88 release compile: fix hash-object logic; do all compiles in background processes and wait for them 2010-09-06 11:45:39 +02:00
Rudolf Polzer
fc00291a3c skip expensive hash-object calls where not needed 2010-09-06 09:11:34 +02:00
Rudolf Polzer
2003f97c2a Merge branch 'master' into divVerent/crypto2 
Conflicts:
	all
 2010-09-04 18:02:00 +02:00
Rudolf Polzer
4baa56d315 also make an engine-only zip 2010-09-04 18:01:13 +02:00