Commit graph

57 commits

Author SHA1 Message Date
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
rambetter
2a99ba3745 No longer including JAPack in default Radiant builds. This is in order
to reduce the size of Windows Radiant builds by a factor of 2.  JAPack
can still be used, but must either be installed manually after a build
is made, or it must be explicitly downloaded before the build.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@435 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-01-22 07:10:03 +00:00
rambetter
4d362964f7 Adding ReactionPack to Radiant code.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@430 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-01-20 05:36:24 +00:00
rambetter
1f99ab9e81 Progressing on bringing Radiant 1.6.x to a workable state on Windows.
This commit:
1. Reverts to using GtkR-deps-1.6-3.zip (instead of GtkR-deps-1.6-4.zip).
Some font-related DLLs are therefore no longer used with this patch.
2. Because of the above #1, now using the really old OpenGL font rendering
code on Windows systems.  This is controlled via "#ifdef _WIN32" blocks.
Linux still uses the new and improved OpenGL font rendering.
Note that this old font rendering that Windows now uses (err, has used in the
past too) makes use of gdk_gl_font_use_pango_font(), which is really old
and crufty.

So, with this commit Radiant is fully working (modulo bugs) on Linux and
Windows, and OpenGL fonts work too.

I WOULD NOT SUGGEST MERGING THIS CHANGE INTO TRUNK.  THE CORRECT APPROACH
IS TO INSTEAD FIX THE DLL LIBRARY DEPENDENCIES IN TRUNK.  I AM ONLY COMMITTING
THIS SO THAT I CAN CONTINUE FIXING BUGS IN RADIANT IN THE MEANTIME.

There are still a zillion bugs on Windows.  For example, I can't even save
a .map file at this point.  That is my next task, to fix saving of .map files.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@350 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-15 09:52:26 +00:00
rambetter
7f2f9610ba Backing out r347 and r345. Keeping r346.
So, this branch is now r344 with patch r346.
DO NOT MERGE THIS CHANGE INTO TRUNK!!!!


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@349 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-15 06:56:33 +00:00
TTimo
7c46911658 rebuilt gtk binary dependencies file
fixed/optimized a number of VC9 project settings
fixed sprintf being hijacked by intl.dll stuff


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@345 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-13 04:21:05 +00:00
TTimo
fa657d36f6 updated the setup functionality on windows, new deps file, bumped version up
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@344 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-29 01:12:35 +00:00
TTimo
dc4e125df2 apply back 335 and 336, will need to update deps and put a zip out
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@343 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-26 19:50:08 +00:00
TTimo
0152053e52 fix Linux compile from mhash stuff
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@339 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-26 06:46:05 +00:00
mattn
6aa8384add * applied Shamus Jedi Academy patch for Zeroradiant (gamepack will follow soon)
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@324 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-12-16 22:33:22 +00:00
TTimo
bef8511de0 fix setup target
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@321 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-09-13 16:12:55 +00:00
mattn
204566e81e * applied patch by StefanV (from mailinglist) that fixes an error in config.py (broke compilation) and some string conversion warnings
* fixes some more string conversions warnings in bobtoolz
* fixed unresolved symbols in bobtoolz and gtkgensurf (due to the above mentioned patch where the prototypes were not updated)


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@320 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-09-06 08:35:17 +00:00
TTimo
cc4e44e31a merge branch work back into trunk
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@319 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-09-01 17:34:10 +00:00
mattn
995f6a1011 * divVerent's patch for the brush primitives surface dialog (fixed segfault due to NULL pointer)
* Quote http://zerowing.idsoftware.com/pipermail/gtkradiant/2008-July/011094.html : Attached to this message is a patch for a "somewhat working" brush
primitives surface dialog. It is an ugly hack, as it converts between
fake texdef notations and brush primitives whenever values are needed.
Had to fix an accuracy bug: the surface dialog rounded all rotation
values to integer angles, which SEVERELY broke things for me (changed
the Gtk spin object to use 4 digits, which is enough for me).

Also, I changed the fake texdef / brush primitives conversions to use
long double internally, as float's roundoff errors were quite visible to
me when testing.

Hope the remaining roundoff errors from converting back and forth won't
kill me, but it worked for a simple map example.

Also, I had to separate out "Snap to grid" and "Don't clamp" into two
separare options. They now mean:

- Snap to grid: snaps drag/etc. actions to the grid
- Don't clamp: disable brush point snapping during many operations, like
  merely shifting brushes, editing texturing parameters, map loading,
  etc.

The reason is that I do need the grid, but I don't want to get my
objects messed up by the snapping in my map. As I am using free
rotations, this DOES change quite much.

The config.py change is needed for compilation on Debian stable;
Debian's scons does not use the CFLAGS variable, but just CCFLAGS and
CXXFLAGS. In newer scons versions, CFLAGS is _shared_ flags for C and
C++, so if you want to require these, you don't need to include the
CFLAGS in CXXFLAGS too.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@301 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-10 08:30:47 +00:00
mattn
1b2e521898 * added Q2wPack and UFOAIPack to setup_packs target
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@247 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-04-08 16:58:37 +00:00
TTimo
555ea60407 working on more installation functionality
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@240 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-04-05 21:38:49 +00:00
TTimo
c5e7176fc3 alternate installation paths for the builders
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@239 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-04-05 19:52:13 +00:00
mattn
62a2a92b5c * fixed libpng linkage (2nd try)
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@231 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-03-19 07:20:06 +00:00
mattn
5685756beb * fixed linkage of imagepng lib
* fixed prtview compilation (missing header)

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@230 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-03-19 07:15:04 +00:00
mattn
d4c6db46c7 * fixed prtview compilation (also included in the build chain now)
* NOTE: Removed CDialog code


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@229 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-03-19 07:02:30 +00:00
mattn
4547d98aa3 * added ufoai plugin to build chain
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@221 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-03-16 19:12:41 +00:00
mattn
a5664116d3 * sample plugin
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@205 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-03-16 08:05:56 +00:00
mattn
ec2a5d09b1 * activate surface_ufoai and model plugins for compilation
* added useGtk = true for surface_ufoai and model plugins
* added picomodel to shared libs list (needed by the model plugin)


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@202 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-03-04 17:01:45 +00:00
TTimo
f33fed31ce misc fixes
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@200 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-03-02 23:36:20 +00:00