Commit graph

80 commits

Author SHA1 Message Date
jdolan
5552711b3c Merging upstream. 2013-07-09 00:08:11 -04:00
jdolan
1019199749 Rename surface_ufoai to surface_idtech2. This plugin should be used for all Quake1 / Quake2 derived games. Updated game packs to be checked in shortly. 2013-07-08 22:20:13 -04:00
Sergio Oller
75cc56d6a3 Linking fix: -lxml2 should be appended after the .o objects when linking to prevent undefined references (and not in LINKFLAGS). Also, FinishBuild was badly indented. 2013-07-07 23:01:06 +02:00
jdolan
b992d051fb Merge branch 'master' of https://github.com/TTimo/GtkRadiant 2013-07-04 20:33:01 -04:00
jdolan
e5b2ced9d1 Remove UFO:AI plugin. 2013-07-04 20:30:11 -04:00
jdolan
45b95af999 Revert "Kill off UFO plugins."
This reverts commit 75cc7d3a45.
2013-07-04 20:12:37 -04:00
jdolan
75cc7d3a45 Kill off UFO plugins. 2013-07-04 13:03:56 -04:00
Timothee Besset
b815d602a5 add more packs, grab zlib dll for x64 q3map2 2013-06-29 22:28:56 +01:00
jdolan
562a941d16 Game packs are now fetched to 'packs' and exported into 'install/installs'. This way we don't have .svn turds kicking around in 'install'. 2013-06-29 15:36:51 -04:00
jdolan
1417d57e98 Add Q2Pack and Q2WPack to default build. 2013-06-29 10:15:26 -04:00
jdolan
32e9a51af2 Remove 'git clone horror' :) 2013-06-27 18:18:44 -04:00
jdolan
625eaa9502 Fix 64 bit windows q3map2 visibility. 2013-06-27 17:48:22 -04:00
jdolan
dac352274a Merged upstream. 2013-06-27 16:57:35 -04:00
jdolan
9237b835f7 Working with no GTK errors whatsoever, crashes on GL init. 2013-06-27 09:32:30 -04:00
jdolan
178ebc262b Unify whitespace and add -headerpad_max_install_names to LINKFLAGS. 2013-06-27 00:36:39 -04:00
Timothee "TTimo" Besset
a97c188cdb fix 2013-06-15 21:09:42 -05:00
Timothee Besset
f0c620b09f pull the Q2WPack in from github during setup 2013-06-15 21:43:43 +01:00
Timothee Besset
7b85f304cf create install\x64 2013-06-09 21:44:48 +01:00
Timothee Besset
8f6b5c4af5 new dependency location 2013-06-09 18:16:18 +01:00
Timothee Besset
444367cb8e new binary dependencies setup 2013-06-08 21:24:42 +01:00
Timothee Besset
0241ec6d9b put q3map2.exe x64 in install/x64, and copy the dependent DLLs 2013-06-07 05:13:20 +01:00
Timothee Besset
0acbb7abbb testing config setup 2013-06-03 00:46:28 +01:00
Timothee Besset
1ec0ec94ba switching to newer gtk and libxml. wip 2013-06-01 23:05:35 +01:00
Timothee "TTimo" Besset
2ca658fe9f convert projects to msvc 2012 2013-05-23 20:44:41 -05:00
Timothee Besset
575c090380 Set the default packs, pull the invocation environment into the scons Environment (for pkg-config) 2013-03-30 09:24:40 -05:00
Radegast
5b40e7d73b Clean up of SCons in preparation to move to CMake (#1) 2013-03-25 17:22:39 +01:00
Radegast
f75ae23357 Mac OS X: if 10.4 SDK is not found, use pkg-config. Link Zlib and GLU. #90 2013-03-09 01:08:44 +00:00
Timothee 'TTimo' Besset
4b1c195962 add q3data to the build. messed up prev commit 2012-10-07 13:37:16 -05:00
Timothee Besset
155fb227e6 OSX with port seems to work out of the box 2012-09-05 14:00:05 -05:00
Timothee 'TTimo' Besset
fe7062c8b9 misc fixes 2012-08-23 22:39:53 -05:00
Timothee 'TTimo' Besset
b1c3ca330b compat with older python 2012-07-15 11:09:23 -05:00
Timothee 'TTimo' Besset
686527fdbc grab the system jpeg and png libraries with the build 2012-07-15 10:39:47 -05:00
Timothee 'TTimo' Besset
3311e3a0da renaming q3map2.urt -> q3map2_urt 2012-07-07 17:39:27 -05:00
Timothee 'TTimo' Besset
ea96f0741a add the QL pack to the default list 2012-07-04 10:24:09 -05:00
Chris Brooke
cce1d1ad8e ql support now compiles on linux 2012-06-20 23:45:29 +01:00
Timothee 'TTimo' Besset
8212783597 compile both versions of q3map2 2012-06-09 13:49:40 -05:00
Timothee 'TTimo' Besset
fd9836715c got it building 2012-05-27 22:26:10 -05:00
Christian Ratzenhofer
f0cb191f52 Add support for W:ET to the game setup dialog 2012-05-06 17:24:12 +02:00
Timothee 'TTimo' Besset
6873f53847 only Q3 and UrT pack for now. will need maintainers on the others to re-add them 2012-04-15 11:24:08 -05:00
Christian Ratzenhofer
d4f7c67be1 Remove calls to wget unzip and cp in the setup target of scons
This allows to build on windows without msys
2012-03-26 01:12:56 +02:00
Ben Noordhuis
d3e3a8e063 build: re-enable optimizations in release builds
Commit f961a54 fixes the q3map2 crash at startup so it's safe to enable
optimizations again.
2012-03-18 02:18:26 +01:00
rambetter
ce733d8b78 Moved windows build paks from Zerowing to icculus.org.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@490 8a3a26a2-13c4-0310-b231-cf6edde360e5
2012-01-04 00:47:49 +00:00
rambetter
b5b1482c98 Changing the SVN respository of game packs to correct one after
the SVN repo switch.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@487 8a3a26a2-13c4-0310-b231-cf6edde360e5
2012-01-01 21:59:26 +00:00
rambetter
c6b22295b6 Removing optimization GCC flags because q3map2 crashes on Ubuntu 10.10 32 bit,
ever since certain updates in that distribution.  This fixes the q3map2 crash,
but no more optimizations.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@486 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-04-23 22:23:31 +00:00
TTimo
772fdfe0b9 bring the libraries back to id hosting
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@481 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-03-05 21:08:28 +00:00
TTimo
b0978b99ca fix Linux x86_64 compile (Debian Sid, gcc 4.4.5)
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@480 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-03-05 20:06:42 +00:00
rambetter
8d530e8707 - Updated Windows build doc, very slight revision. Changed 37 targets to 38.
- Added plugins/imagehl to list of modules built (both	Windows and Linux).
    Not	really sure what this does, but it's the only module (as defined by
    stuff in plugins/ or contrib/) that exists and isn't currently part of the
    build.
- The code to disable desktop composition in Windows has been moved from start
    of main() to an option in Preferences.  The	pref reads as follows:
    "NVIDIA/Aero bug - disable Windows composition".  It is enabled by default.
- Color themes controlled by "Misc" -> "Colors" -> "Themes" options are now
    saved as soon as you select them.  The color theme is no longer clobbered
    when opening Preferences.
- The ATI broken driver (bug #802) pref has been reworded since it applies to
    Intel cards as well.  Before:
    "ATI cards with broken drivers - bug #802".  After:
    "ATI and Intel cards w/ buggy drivers (disappearing polygons)".


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@479 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-03-03 15:51:44 +00:00
rambetter
9ef80305de The release config for radiant target was busted on Linux in SCons build.
Problem was that the compile flags were overly aggressive and caused segfaults.
They included: -O3 -Winline -ffast-math -fno-unsafe-math-optimizations
  -fno-strict-aliasing
Changed to: -O2 -fno-strict-aliasing
From my experience, -O3 is usually a bad idea.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@476 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-02-24 03:53:03 +00:00
rambetter
48410b113d Fixing Linux SCons build.
Fixing plugins on both Linux and Windows.  It's consistent now.
Fixing gl font on Windows.
Mostly, added lots of plugins.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@474 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-02-22 04:48:05 +00:00
rambetter
561e062c87 This is a major change that updates the 3rd party libs on Windows builds.
A couple of things are broken right now:
- OpenGL font in Windows not appearing (expected to be broken, will fix)
- Linux build broken because it loads some .vcproj files that are removed
- 3rd party libs are downloaded from porky.nerius.com, not id Software


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@473 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-02-21 14:37:49 +00:00