Commit Graph

185 Commits

Author SHA1 Message Date
Rudolf Polzer 6ead1aa8fc lazy hack to make make work 2013-08-02 13:27:43 +02:00
Rudolf Polzer 694955af8e rework symlink creation logic 2013-08-02 12:49:17 +02:00
Rudolf Polzer e63a12c418 also add an unsuffixed symlink, fixes #1710 2013-07-06 18:58:00 +02:00
Stijn Buys 1dc200b9e0 On Linux, set the default executable suffix to 'uname -m' 2013-06-25 23:40:55 +02:00
Rudolf Polzer 0fbfb4bcc9 Fedora support patch by maci (make DLL finding work with Fedora's mingw) 2013-01-14 21:21:37 +01:00
Rudolf Polzer 0d10413fe0 fix how glib is included 2012-03-01 14:43:00 +01:00
Rudolf Polzer ed96b4352a no longer use an included libjpeg copy. Use the system one. 2012-03-01 10:35:32 +01:00
Rudolf Polzer 747e474c40 remove internal libjpeg6 copy (patch by monad) 2012-03-01 10:24:29 +01:00
Rudolf Polzer ebcb592432 OS X: support homebrew by MACLIBDIR=/usr/local/lib 2012-01-23 20:29:05 +01:00
Rudolf Polzer 326b154fca Merge branch 'master' of git://de.git.xonotic.org/xonotic/netradiant 2012-01-14 00:32:48 +01:00
Rudolf Polzer 57d64f977f fix dependency check causing recompile of all .c files 2012-01-14 00:25:21 +01:00
Rudolf Polzer 7343cc1f7e another compile fix for win32 on arch linux 2012-01-13 23:42:48 +01:00
Rudolf Polzer 8ecf001ea4 better fit mingw on Arch Linux 2012-01-13 23:28:18 +01:00
Rudolf Polzer 35162b6b63 properly ignore caulk 2011-12-09 17:15:51 +01:00
Rudolf Polzer 9e69c83769 make dependencies check work even with -j make invocation 2011-12-04 18:19:34 +01:00
Rudolf Polzer 636baaba0f more compile fail 2011-07-01 12:18:32 +02:00
Rudolf Polzer ff1b9a5bfa fix a compile error 2011-07-01 11:37:54 +02:00
Rudolf Polzer c75ae4296b forbidden dirs: allow wildcard patterns 2011-07-01 11:27:15 +02:00
Rudolf Polzer 8ab31087a4 fix another error 2011-05-16 15:08:02 +02:00
Rudolf Polzer 0a4e4f3786 more changes by Nikoli 2011-01-27 16:48:47 +01:00
Rudolf Polzer 24856f2621 makefile changes by Nikoli to allow building some parts separately 2011-01-27 07:38:54 +01:00
Rudolf Polzer 10d0890e16 always chmod the release exe file 2010-12-31 13:37:20 +01:00
Rudolf Polzer 6f9e9fd122 intermediate commit to add .obj conversion support 2010-12-23 09:11:47 +01:00
Rudolf Polzer 3316aca1f4 don't om nom nom nom away the file you just wrote 2010-12-20 09:48:19 +01:00
Rudolf Polzer cb0f0daa02 vars don't work the way I think... 2010-12-20 08:29:52 +01:00
Rudolf Polzer 3fc0434acf more release-win32 fixes 2010-12-20 08:27:43 +01:00
Rudolf Polzer 35554d1b10 properly brand the builds 2010-12-20 08:14:46 +01:00
Rudolf Polzer 0fed63bc8f add a comment 2010-12-20 08:09:34 +01:00
Rudolf Polzer 4d8ac8bf0b release building: more stuff 2010-12-20 08:09:10 +01:00
Rudolf Polzer fd02c5f803 shorten the file names 2010-12-20 08:07:24 +01:00
Rudolf Polzer 80bcec6979 fix make release-all 2010-12-20 07:51:25 +01:00
Rudolf Polzer 9fd00a1826 a release-all target 2010-12-20 07:50:24 +01:00
Rudolf Polzer 839a76da2c add makefile targets for source tarballs 2010-12-20 07:49:38 +01:00
Rudolf Polzer af702de039 be more specific about depcheck errors (show whether compile or link stage failed) 2010-12-18 22:40:31 +01:00
Rudolf Polzer 85fdf3de30 change UNZIP to UNZIPPER to make OAPack work 2010-12-05 17:27:36 +01:00
Rudolf Polzer e240a832bd pango font stuff: remove reference to a deprectaed pango interface from the new ZeroRadiant code (duh...); make pango a proper dependency now 2010-11-18 12:55:49 +01:00
Rudolf Polzer 08f58dfd1f makefile: make verbose dep check more verbose 2010-11-16 14:06:41 +01:00
merlijn eadc09e9f6 Update these files as well 2010-08-29 20:47:06 +02:00
Jānis Rūcis e2bde4a529 Makefile: support CHECK_DEPENDENCIES with DOWNLOAD_GAMEPACKS semantics 2010-06-25 14:04:13 +03:00
Rudolf Polzer 83cbe921dc fix typo in the makefile (adding an extra space) 2010-04-12 14:47:42 +02:00
Rudolf Polzer eeda7cae23 autodownload gamepacks from make 2010-04-12 08:15:27 +02:00
Rudolf Polzer cda0d10a1b switch version tracking to git 2010-04-02 15:18:27 +02:00
Rudolf Polzer d40c79f30c Merge branch 'osxnetradiant'
Conflicts:
	contrib/bobtoolz/DPatch.cpp
	contrib/bobtoolz/bobToolz-GTK.cpp
	contrib/bobtoolz/funchandlers-GTK.cpp
	install-dylibs.sh
	setup/data/osx/NetRadiant.app/Contents/MacOS/netradiant.sh
2010-03-28 19:32:53 +02:00
Rudolf Polzer a3cfcb0acd some minor fixes for the osxnetradiant changes 2010-03-28 19:17:58 +02:00
Rudolf Polzer 7dd945e36a changes from OSXnetradiant 2010-03-28 19:14:14 +02:00
Rudolf Polzer 41fbd07915 show error about missing gamepack 2010-02-14 20:08:59 +01:00
divverent 32dcbf7747 separate out the process of installing a game pack into a .sh file, for later "adding gamepacks to binary releases"
git-svn-id: svn://svn.icculus.org/netradiant/trunk@421 61c419a2-8eb2-4b30-bcec-8cead039b335
2010-02-04 09:55:28 +00:00
divverent c07007fb1e add warning for missing game packs
git-svn-id: svn://svn.icculus.org/netradiant/trunk@419 61c419a2-8eb2-4b30-bcec-8cead039b335
2010-01-13 14:37:46 +00:00
divverent 71562074b6 some fixes, and patch bobtoolz improvements, from osxnetradiant
git-svn-id: svn://svn.icculus.org/netradiant/trunk@403 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-12-18 08:03:34 +00:00
divverent 857830098f -fno-strict-aliasing
git-svn-id: svn://svn.icculus.org/netradiant/trunk@395 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-08-08 12:50:15 +00:00
divverent a94abb3026 allow specifying executable type
git-svn-id: svn://svn.icculus.org/netradiant/trunk@391 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-07-25 10:23:32 +00:00
divverent d0244e3b2e better dependency check
git-svn-id: svn://svn.icculus.org/netradiant/trunk@354 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-04-28 13:08:15 +00:00
divverent ddf60e7f70 also accept OS=Windows_NT
git-svn-id: svn://svn.icculus.org/netradiant/trunk@241 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-04-01 17:28:26 +00:00
divverent 64eee327a3 OSX: make the app bundle run without fink installed, by copying all required libraries into the install directory
git-svn-id: svn://svn.icculus.org/netradiant/trunk@203 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-03-04 08:51:00 +00:00
divverent 469e4fc146 fix MD3 model entities crash on OS X (by renaming a class; apparently something weird happens when a class name is used twice)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@201 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-03-04 07:06:05 +00:00
divverent 0909d3201d don't count on make predefining $(WINDRES)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@194 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-02-21 17:45:29 +00:00
divverent 6e3846c8c3 retain _q3map2_version worldspawn tag when using -onlyents
git-svn-id: svn://svn.icculus.org/netradiant/trunk@184 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-02-10 06:30:50 +00:00
divverent 85e72d11b3 more defensive coding :P
git-svn-id: svn://svn.icculus.org/netradiant/trunk@182 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-02-08 19:40:15 +00:00
divverent 95938cb820 fix some typos
git-svn-id: svn://svn.icculus.org/netradiant/trunk@177 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-15 06:37:43 +00:00
divverent f1136218cf initial OS X app building stuff. May be broken.
git-svn-id: svn://svn.icculus.org/netradiant/trunk@176 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-15 06:35:13 +00:00
divverent ccf6f80900 this needs zlib LIBS on OS X too
git-svn-id: svn://svn.icculus.org/netradiant/trunk@175 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-14 12:41:57 +00:00
divverent b5862f3587 yet another OS X workaround
git-svn-id: svn://svn.icculus.org/netradiant/trunk@174 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-14 12:37:56 +00:00
divverent 7421140b5f reverse order of includes to fix jpeg problems on OS X
git-svn-id: svn://svn.icculus.org/netradiant/trunk@173 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-14 12:33:52 +00:00
divverent e467f40d4a it now compiles on OS X, but does it work?
git-svn-id: svn://svn.icculus.org/netradiant/trunk@169 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-09 22:44:43 +00:00
divverent 2fbd497884 more makefile fixes for OS X
git-svn-id: svn://svn.icculus.org/netradiant/trunk@168 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-09 22:22:22 +00:00
divverent 1fcc7b896c no ldd on OS X either
git-svn-id: svn://svn.icculus.org/netradiant/trunk@167 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-09 22:18:33 +00:00
divverent 30662a9f6f extra libs workaround
git-svn-id: svn://svn.icculus.org/netradiant/trunk@166 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-09 22:17:34 +00:00
divverent 81ba832096 opengl workaround for os x
git-svn-id: svn://svn.icculus.org/netradiant/trunk@165 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-09 22:13:02 +00:00
divverent 69094788e7 that option didn't even exist!
git-svn-id: svn://svn.icculus.org/netradiant/trunk@164 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-09 22:01:00 +00:00
divverent 1fb26db120 add pkgconfig dependency
git-svn-id: svn://svn.icculus.org/netradiant/trunk@163 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-09 21:59:04 +00:00
divverent f1ed482f19 indent...
git-svn-id: svn://svn.icculus.org/netradiant/trunk@162 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-09 21:53:12 +00:00
divverent 4c63e1f574 don't use else ifeq
git-svn-id: svn://svn.icculus.org/netradiant/trunk@161 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-09 21:52:07 +00:00
divverent eb7125d282 don't use "else ifeq"
git-svn-id: svn://svn.icculus.org/netradiant/trunk@160 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-09 21:48:52 +00:00
divverent d0d88d3503 make everything support installdir
git-svn-id: svn://svn.icculus.org/netradiant/trunk@157 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-07 14:00:29 +00:00
divverent 5703b5a6ea now using "sed" to cut off the version
git-svn-id: svn://svn.icculus.org/netradiant/trunk@156 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-07 13:20:08 +00:00
divverent c3e0933463 new stuff... INSTALLDIR
git-svn-id: svn://svn.icculus.org/netradiant/trunk@155 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-07 13:12:52 +00:00
divverent 1d15fd3b87 port some obvious vars from the original SConstruct/SConscript to the Darwin block; Darwin still not working for sure
git-svn-id: svn://svn.icculus.org/netradiant/trunk@154 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-07 12:42:34 +00:00
divverent bc745f7342 update changelog; make the Makefile support a MAKEFILE_CONF parameter to not have to symlink cross-Makefile.conf all the time
git-svn-id: svn://svn.icculus.org/netradiant/trunk@134 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-12-09 09:04:07 +00:00
rpolzer 3aab20c1d6 radiant: make rotate/scale dialogs non-modal
git-svn-id: svn://svn.icculus.org/netradiant/trunk@95 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-19 12:31:32 +00:00
rpolzer 9035361429 add support for a profiling build
git-svn-id: svn://svn.icculus.org/netradiant/trunk@92 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-19 05:45:09 +00:00
rpolzer 04397d579b delete .rc files in make clean
git-svn-id: svn://svn.icculus.org/netradiant/trunk@89 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-18 09:48:26 +00:00
rpolzer 01a2a09b61 git-svn-id: svn://svn.icculus.org/netradiant/trunk@87 61c419a2-8eb2-4b30-bcec-8cead039b335 2008-09-18 09:39:06 +00:00
rpolzer 0311549284 detect svn version
git-svn-id: svn://svn.icculus.org/netradiant/trunk@83 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-17 13:45:02 +00:00
rpolzer 35e04d29f4 use new directory, remove -div0 from version
git-svn-id: svn://svn.icculus.org/netradiant/trunk@82 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-17 13:39:58 +00:00
rpolzer 8a5dd5605f move debug to extradbeug, add a "debug" build config that's less debuggy (just -g, still -O (not -O3), no extra debug code)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@79 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-17 11:10:47 +00:00
rpolzer 911a5e0fdd more depcheck fixes
git-svn-id: svn://svn.icculus.org/netradiant/trunk@78 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-17 07:34:12 +00:00
rpolzer f79a93f095 better depcheck
git-svn-id: svn://svn.icculus.org/netradiant/trunk@77 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-17 07:29:59 +00:00
rpolzer c9194538d4 allow disabling depcheck
git-svn-id: svn://svn.icculus.org/netradiant/trunk@75 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-17 06:22:22 +00:00
rpolzer 224f26f10b fix the dependency checking
git-svn-id: svn://svn.icculus.org/netradiant/trunk@74 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-17 06:13:34 +00:00
rpolzer cf7024d5af dependency test (like configure)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@73 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-17 05:58:57 +00:00
rpolzer 7833c7dd81 make clean :P
git-svn-id: svn://svn.icculus.org/netradiant/trunk@70 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-16 17:53:15 +00:00
rpolzer c2ae50ffbd more makefile fixes
git-svn-id: svn://svn.icculus.org/netradiant/trunk@68 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-16 17:49:33 +00:00
rpolzer b854b81579 oh no! more fixes
git-svn-id: svn://svn.icculus.org/netradiant/trunk@67 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-16 17:16:26 +00:00
rpolzer 04c0ff0ad1 more makefile fixes
git-svn-id: svn://svn.icculus.org/netradiant/trunk@66 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-16 17:08:54 +00:00
rpolzer 16164a2ee9 even more makefile fixes
git-svn-id: svn://svn.icculus.org/netradiant/trunk@64 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-16 16:17:01 +00:00
rpolzer 96769b5269 make the makefile a bit more customizable
git-svn-id: svn://svn.icculus.org/netradiant/trunk@63 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-16 16:05:27 +00:00
rpolzer 0c406924dc remove unnecessary script; fix "make clean"
git-svn-id: svn://svn.icculus.org/netradiant/trunk@62 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-16 15:58:03 +00:00
rpolzer c6cc64acaf Makefile: normalize the flags, put all user customizable stuff at the top
git-svn-id: svn://svn.icculus.org/netradiant/trunk@61 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-16 15:55:50 +00:00
rpolzer ff8033e08a new DLL setup; now working with Gtk+ 2.2
git-svn-id: svn://svn.icculus.org/netradiant/trunk@58 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-16 11:07:59 +00:00
rpolzer 27c64c0cf4 automatically find DLLs
git-svn-id: svn://svn.icculus.org/netradiant/trunk@57 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-16 08:39:49 +00:00