Kp
b87e7c2325
Merge branch 'd2x-rebirth/master' into unification/master
2013-06-02 20:14:42 +00:00
Kp
e5ab7e85c4
Fix SCons parse errors for Darwin
2013-05-05 23:20:06 +00:00
Kp
1fb458fcf5
Support building multiple DXX configurations at once
2013-05-05 23:12:52 +00:00
Kp
3ea05cf282
Add support for linking under an alternate name
2013-05-05 22:59:09 +00:00
Kp
8a6356e208
Add support for DESTDIR installs
2013-05-05 22:55:16 +00:00
Kp
d77f4ed6a1
Allow user to suppress install target
2013-05-05 22:50:19 +00:00
Kp
2d84785cb1
Automatically append "-editor" to editor binary names
2013-05-05 22:44:22 +00:00
Kp
a89da5148f
Report OpenGL ES path without a program
2013-05-05 18:52:00 +00:00
Kp
fe6195fc99
Simplify reading $LDFLAGS
2013-05-05 23:33:38 +00:00
Kp
410b07d5c4
Merge branch 'd1x-rebirth/master' into unification/master
...
Conflicts:
SConstruct
2013-05-05 22:08:34 +00:00
Kp
1106583ae3
Move path defaults up so they can be shown without a program
2013-05-05 22:03:32 +00:00
Kp
c3f06fac9e
Move RPi defaults up so they can be shown without a program
2013-05-05 22:03:32 +00:00
Kp
9dfbe87b0d
Run banner() sooner
2013-05-05 22:03:32 +00:00
Kp
dbec5197f6
Move */main/vers_id.c -> similar/main/vers_id.c
2013-05-05 17:39:03 +00:00
Kp
2fc9fe867f
Fix longstanding bug preventing build of both Windows binaries at once
...
SCons rejected building both Windows targets due to conflicting
instructions on how to compile messagebox.c. Restructure the lookup so
that only one set of instructions is issued.
2013-05-05 17:39:03 +00:00
Kp
722f2efbf5
Move lazy object construction to a separate class
2013-05-05 17:39:03 +00:00
Kp
4a20b47dec
Fix path to .rc file for Windows build
2013-05-05 17:39:03 +00:00
Kp
3cc87d57c6
Add support for cross-compilation
2013-05-05 17:39:03 +00:00
Kp
4aaaa53f60
Use program.srcdir, not self.srcdir for Win32PlatformSettings
2013-05-05 17:39:03 +00:00
Kp
9e5ef66204
Add Win32PlatformSettings.__init__ to fix SConstruct for Windows
2013-05-05 17:39:03 +00:00
Kp
1256332ebf
Chain objects_editor property
2013-05-05 17:38:58 +00:00
Kp
813dcb8554
Chain objects_common lookup to simplify users
2013-05-05 17:35:44 +00:00
Kp
1efaa50f6a
Allow source lists to carry extra attributes
...
Use it to move the transform_target parameter into the list itself.
Fix the non-OpenGL build, which should have had a transform_target
parameter and did not.
2013-05-05 04:03:45 +00:00
Kp
ace1902ef7
Add Raspberry Pi automatic environment setup
...
Patch by derhass.
Requested at
<http://www.dxx-rebirth.com/frm/index.php/topic,1048.msg17426/topicseen.html#msg17426 >.
2013-05-04 17:13:31 +00:00
Kp
616a3a6b70
Merge branch d1x-rebirth into unification/master
...
Conflicts:
SConstruct
common/main/cntrlcen.h
common/main/fuelcen.h
common/main/fvi.h
common/main/gameseq.h
common/main/gauges.h
common/main/multibot.h
common/main/net_udp.h
common/main/object.h
common/main/player.h
common/main/vers_id.h
d1x-rebirth/main/hostage.c
d1x-rebirth/main/multi.c
main/controls.c
main/hostage.h
main/laser.h
main/screens.h
similar/arch/ogl/gr.c
similar/editor/centers.c
similar/main/inferno.c
similar/main/lighting.c
similar/main/multibot.c
similar/main/paging.c
similar/main/physics.c
similar/main/player.c
similar/main/robot.c
similar/main/wall.c
2013-04-21 04:51:35 +00:00
Kp
0afdb86910
Construct self.sources sooner so that code can always append to it
2013-04-20 23:52:17 +00:00
Kp
ebc971be95
Support cross-configuring SDL
2013-04-20 20:35:58 +00:00
Kp
63b1abc80a
Store fixed values at class scope
2013-04-20 20:35:58 +00:00
Kp
528ea51ce4
Refactor SConstruct register_program handling
2013-04-20 20:35:58 +00:00
Kp
17ca9f15bd
Move compiler flags/selection into a base class above DXXProgram
2013-04-20 20:35:58 +00:00
Kp
47aa7d000d
Make CPPDEFINES consistent with unification branch
2013-04-20 20:35:58 +00:00
Kp
e658660d21
Make name of GLES_CM library configurable
2013-04-20 20:35:58 +00:00
zico
758f2d64f8
Support for Raspberry Pi - patch by derhass
2013-04-08 12:54:02 +02:00
Chris Taylor
175cad804c
For SCons in Mac OS X, make sure the frameworks are linked properly
2013-04-08 16:21:53 +08:00
Chris Taylor
7683d7998d
For Mac in SCons, find the HIServices framework for physfsx.c
2013-04-08 14:35:48 +08:00
Chris Taylor
f3b1294bf0
For Mac, in SCons link against physfs properly
2013-04-08 14:27:36 +08:00
Chris Taylor
e3eabde3ca
Allow SCons to find the HIServices framework for the Mac code in physfsx.c
2013-04-08 13:00:05 +08:00
Chris Taylor
3cffacb9b2
Changes towards building using SCons on Mac OS X
2013-04-05 09:25:10 +08:00
Chris Taylor
b750415db6
For the assembler build, make sure platform_settings is accessed from self, likely preventing a compiling error
2013-04-05 09:12:33 +08:00
Kp
929f29dca9
Support extra information, such as git describe, in version string
2013-03-31 20:41:19 +00:00
Kp
39199291e1
Remove -pedantic
...
It warns about the editor build and serves no purpose.
2013-03-22 03:04:00 +00:00
Kp
a1fe33147a
Switch from C99 to Gnu99 to make editor build work
2013-03-22 03:04:00 +00:00
Kp
ff96f3239d
Move */main/controls.c -> similar/main/controls.c
2013-03-03 01:03:33 +00:00
Kp
86f373e4e0
Move */main/multibot.c -> similar/main/multibot.c
2013-03-03 01:03:33 +00:00
Kp
691b95a02c
Move */main/physics.c -> similar/main/physics.c
2013-03-03 01:03:33 +00:00
Kp
0138d330b3
Move */main/inferno.c -> similar/main/inferno.c
2013-03-03 01:03:33 +00:00
Kp
dab72f3127
Move */main/robot.c -> similar/main/robot.c
2013-03-03 01:03:33 +00:00
Kp
4b18dcbff9
Move */main/text.c -> similar/main/text.c
2013-03-03 01:03:33 +00:00
Kp
8d379f4f9c
Move */3d/interp.c -> similar/3d/interp.c
2013-03-03 01:03:33 +00:00
Kp
d2e3ed0228
Move */main/wall.c -> similar/main/wall.c
2013-03-03 01:03:33 +00:00