Kp
1030915f1c
Move */editor/medmisc.c -> similar/editor/medmisc.c
2013-03-17 23:01:33 +00:00
Kp
bff770f1d8
Move */editor/medsel.c -> similar/editor/medsel.c
2013-03-17 23:01:33 +00:00
Kp
5ca4d35bf5
Move */editor/texture.c -> similar/editor/texture.c
2013-03-17 23:01:33 +00:00
Kp
a9123e0b45
Move */texmap/*.c -> common/texmap
2013-03-17 23:01:32 +00:00
Kp
db5239deee
Move */main/console.c -> similar/main/console.c
2013-03-17 23:01:32 +00:00
Kp
51d79f7620
Store source lists at close scope and object lists at instance scope
2013-03-17 23:01:32 +00:00
Kp
a707c053db
Consistently use suffix of _sources for source lists
2013-03-17 23:01:32 +00:00
Kp
ed188ea088
Store fixed values at class scope
2013-03-17 23:01:32 +00:00
Kp
d55046eed1
Support building D1X and D2X into different build directories
...
This enables building the two games with different options.
2013-03-17 23:01:32 +00:00
Kp
909a5d6847
Show target build directory in non-verbose builds
2013-03-17 23:01:32 +00:00
Kp
54d57a37c9
Add support for out-of-tree build
2013-03-17 23:01:32 +00:00
Kp
6096c63ece
Use lazy construction for DXXArchive common objects
...
These will always be constructed, but using lazy construction simplifies
the code.
2013-03-17 23:01:32 +00:00
Kp
8359c3cdd7
Give DXXArchive a private argument prefix of "common"
2013-03-17 23:01:32 +00:00
Kp
afab0f4bb8
Allow user to override Raspberry Pi defaults
2013-03-17 23:01:32 +00:00
Kp
a842ddca86
Move */editor/autosave.c -> similar/editor/autosave.c
2013-03-17 23:01:32 +00:00
Kp
bd9702463e
Move */editor/elight.c -> similar/editor/elight.c
2013-03-17 23:01:32 +00:00
Kp
1aa9ae721e
Move */editor/fixseg.c -> similar/editor/fixseg.c
2013-03-17 23:01:32 +00:00
Kp
f9f14afec5
Move */editor/func.c -> common/editor/func.c
2013-03-17 23:01:32 +00:00
Kp
756ded6007
Move */editor/info.c -> similar/editor/info.c
2013-03-17 23:01:32 +00:00
Kp
a338f81663
Move */editor/kbuild.c -> similar/editor/kbuild.c
2013-03-17 23:01:32 +00:00
Kp
af3707d1c0
Move */editor/kcurve.c -> similar/editor/kcurve.c
2013-03-17 23:01:32 +00:00
Kp
6b5336a4b3
Move */editor/kfuncs.c -> similar/editor/kfuncs.c
2013-03-17 23:01:32 +00:00
Kp
ead39c4cc8
Move */editor/khelp.c -> similar/editor/khelp.c
2013-03-17 23:01:32 +00:00
Kp
e66b36de14
Move */arch/sdl/gr.c -> similar/arch/sdl/gr.c
2013-03-17 23:01:32 +00:00
Kp
6ef38884e1
Move */arch/sdl/key.c -> similar/arch/sdl/key.c
2013-03-17 23:01:31 +00:00
Kp
ddb26fa198
Move */arch/sdl/event.c -> similar/arch/sdl/event.c
2013-03-17 23:01:31 +00:00
Kp
b5c3902697
Move */arch/sdl/init.c -> similar/arch/sdl/init.c
2013-03-17 23:01:31 +00:00
Kp
d64f605f54
Move */arch/sdl/joy.c -> common/arch/sdl/joy.c
2013-03-17 23:01:31 +00:00
Kp
4bd3f0dbec
Move */arch/sdl/mouse.c -> similar/arch/sdl/mouse.c
2013-03-17 23:01:31 +00:00
Kp
b14f7c2f5f
Move */arch/ogl/gr.c -> similar/arch/ogl/gr.c
2013-03-17 23:01:31 +00:00
Kp
299b47656b
Move */misc/hash.c -> similar/misc/hash.c
2013-03-17 23:01:31 +00:00
Kp
68fec5f94a
Move */misc/physfsx.c -> similar/misc/physfsx.c
2013-03-17 23:01:31 +00:00
Kp
5c1f0f68cc
Move */mem/mem.c -> similar/mem/mem.c
2013-03-17 23:01:31 +00:00
Kp
78fde624f6
Move */arch/sdl/timer.c -> similar/arch/sdl/timer.c
2013-03-17 23:01:31 +00:00
Kp
ea29654c53
Move */arch/sdl/jukebox.c -> similar/arch/sdl/jukebox.c
2013-03-17 23:01:31 +00:00
Kp
3fe3da9a25
Move */arch/ogl/ogl.c -> similar/arch/ogl/ogl.c
2013-03-17 23:01:31 +00:00
Kp
c34a25e1ed
Move */arch/sdl/digi_mixer_music.c -> common/arch/sdl/digi_mixer_music.c
2013-03-17 23:01:31 +00:00
Kp
0087b144a9
Combine SConstruct register_program handling
2013-03-17 23:01:31 +00:00
Kp
68af7a81ba
Move */arch/sdl/rbaudio.c -> common/arch/sdl/rbaudio.c
2013-03-17 23:01:30 +00:00
Kp
eb8ebe40b9
Move */arch/sdl/window.c -> common/arch/sdl/window.c
2013-03-03 01:03:33 +00:00
Kp
504cf23746
Move */arch/win32/messagebox.c -> common/arch/win32/messagebox.c
2013-03-03 01:03:33 +00:00
Kp
29ede4c86c
Move */ui/button.c -> common/ui/button.c
2013-03-03 01:03:33 +00:00
Kp
ac04f4b247
Move */ui/checkbox.c -> common/ui/checkbox.c
2013-03-03 01:03:33 +00:00
Kp
7ecbc5b123
Move */ui/dialog.c -> common/ui/dialog.c
2013-03-03 01:03:33 +00:00
Kp
08e8d0e499
Move */ui/file.c -> common/ui/file.c
2013-03-03 01:03:33 +00:00
Kp
b42de62167
Move */ui/gadget.c -> common/ui/gadget.c
2013-03-03 01:03:33 +00:00
Kp
8657a99491
Move */ui/icon.c -> common/ui/icon.c
2013-03-03 01:03:33 +00:00
Kp
345b90bf3f
Move */ui/inputbox.c -> common/ui/inputbox.c
2013-03-03 01:03:33 +00:00
Kp
091b287c82
Move */ui/keypad.c -> common/ui/keypad.c
2013-03-03 01:03:33 +00:00
Kp
64708c932f
Move */ui/keypress.c -> common/ui/keypress.c
2013-03-03 01:03:33 +00:00
Kp
60f0b1e557
Move */ui/keytrap.c -> common/ui/keytrap.c
2013-03-03 01:03:33 +00:00
Kp
a0a6f508a5
Move */ui/listbox.c -> common/ui/listbox.c
2013-03-03 01:03:33 +00:00
Kp
2ecc20143a
Move */ui/menu.c -> common/ui/menu.c
2013-03-03 01:03:33 +00:00
Kp
53ef9150ed
Move */ui/menubar.c -> common/ui/menubar.c
2013-03-03 01:03:33 +00:00
Kp
eea0add439
Move */ui/message.c -> common/ui/message.c
2013-03-03 01:03:33 +00:00
Kp
d07828f8d2
Move */ui/popup.c -> common/ui/popup.c
2013-03-03 01:03:33 +00:00
Kp
96c0c1f06b
Move */ui/radio.c -> common/ui/radio.c
2013-03-03 01:03:33 +00:00
Kp
2c67ea8f66
Move */ui/scroll.c -> common/ui/scroll.c
2013-03-03 01:03:33 +00:00
Kp
9c047e69c0
Move */ui/ui.c -> common/ui/ui.c
2013-03-03 01:03:33 +00:00
Kp
daa5fbf373
Move */ui/uidraw.c -> common/ui/uidraw.c
2013-03-03 01:03:33 +00:00
Kp
975df703a8
Move */ui/userbox.c -> common/ui/userbox.c
2013-03-03 01:03:33 +00:00
Kp
a259ecf691
Move */include/editor/seguvs.h -> common/include/editor/seguvs.h
2013-03-03 01:03:33 +00:00
Kp
863bcff083
Move */misc/dl_list.c -> common/misc/dl_list.c
2013-03-03 01:03:33 +00:00
Kp
54affd79a9
Move */misc/error.c -> common/misc/error.c
2013-03-03 01:03:33 +00:00
Kp
630344aa98
Move */misc/hmp.c -> common/misc/hmp.c
2013-03-03 01:03:33 +00:00
Kp
451c3746a5
Move */misc/ignorecase.c -> common/misc/ignorecase.c
2013-03-03 01:03:33 +00:00
Kp
c5279ea5e8
Move */misc/strio.c -> common/misc/strio.c
2013-03-03 01:03:33 +00:00
Kp
610459c520
Move */misc/strutil.c -> common/misc/strutil.c
2013-03-03 01:03:33 +00:00
Kp
2fc1cba2b5
Move */3d -> common/3d
...
Move all the common 3d/ code into a common directory. Substantial
differences exist in 3d/interp.c, so it is not yet common.
2013-03-03 01:03:33 +00:00
Kp
a79652dc9d
Remove -pedantic
...
It warns about the editor build and serves no purpose.
2013-03-09 00:25:10 +00:00
Kp
ff448b535f
Switch from C99 to Gnu99 to make editor build work
2013-03-09 22:11:54 +00:00
Kp
26cfa7b39c
Move */2d/2dsline.c -> common/2d/2dsline.c
2013-03-03 01:03:33 +00:00
Kp
9951b893ab
Move */2d/bitblt.c -> common/2d/bitblt.c
2013-03-03 01:03:33 +00:00
Kp
cc67fd23a2
Move */2d/bitmap.c,bitmap.h -> common/2d/bitmap.c,bitmap.h
...
Modify */2d/font.c to find the moved bitmap.h
2013-03-03 01:03:33 +00:00
Kp
ccd1268e9d
Move */2d/box.c -> common/2d/box.c
2013-03-03 01:03:33 +00:00
Kp
733c0f34da
Move */2d/canvas.c -> common/2d/canvas.c
2013-03-03 01:03:33 +00:00
Kp
016c2a44f5
Move */2d/circle.c -> common/2d/circle.c
2013-03-03 01:03:33 +00:00
Kp
55cb06f45f
Move */2d/disc.c -> common/2d/disc.c
2013-03-03 01:03:33 +00:00
Kp
4adefcdfa1
Move */2d/gpixel.c -> common/2d/gpixel.c
2013-03-03 01:03:33 +00:00
Kp
2d84c85915
Move */2d/clip.h,line.c -> common/2d/clip.h,line.c
2013-03-03 01:03:33 +00:00
Kp
2e7c092bb0
Move */2d/pixel.c -> common/2d/pixel.c
2013-03-03 01:03:33 +00:00
Kp
11f7182d45
Move */2d/poly.c -> common/2d/poly.c
2013-03-03 01:03:33 +00:00
Kp
54c847a88b
Move */2d/rect.c -> common/2d/rect.c
2013-03-03 01:03:33 +00:00
Kp
902e068d1c
Move */2d/rle.c -> common/2d/rle.c
2013-03-03 01:03:33 +00:00
Kp
227d1377fa
Move */2d/scalec.c -> common/2d/scalec.c
2013-03-03 01:03:33 +00:00
Kp
04b545ee29
Move */maths/vecmat.c -> common/maths/vecmat.c
2013-03-03 01:03:33 +00:00
Kp
a872eb86a7
Move */maths/tables.c -> common/maths/tables.c
2013-03-03 01:03:33 +00:00
Kp
7099238a95
Move */maths/rand.c -> common/maths/rand.c
2013-03-03 01:03:33 +00:00
Kp
05e34150db
Move */maths/fixc.c -> common/maths/fixc.c
2013-03-03 01:03:33 +00:00
Kp
4033f2020b
Move */main/inferno.h -> common/main/inferno.h
...
Add preprocessor symbols to detect which version of Descent is built,
since some headers are not identical between the two versions, but are
close enough to be worth sharing.
2013-03-03 01:03:33 +00:00
Kp
1c2ab15475
Move */include/pstypes.h -> common/include/pstypes.h
2013-03-03 01:03:33 +00:00
Kp
5734989389
Move compiler flags/selection into a base class above DXXProgram
2013-03-03 00:53:35 +00:00
Kp
161aeb6a5c
Use a unified SConstruct for both Descent programs
2013-03-02 20:53:47 +00:00
Kp
beb0690633
Move d1x-rebirth source into subdirectory d1x-rebirth
2013-02-19 00:34:46 +00:00
Kp
a4e396aa53
Remove -D_REENTRANT and instead pass -pthread
...
Pass -pthread to let gcc define threading, instead of using -D_REENTRANT
directly.
2013-03-03 22:24:12 +00:00
Kp
466e6e8f54
Move compiler flags out of SConstruct preprocessor line
2013-03-03 22:23:44 +00:00
Kp
9b8af60c2c
Prepare for files to be in a subdirectory
2013-03-03 02:20:54 +00:00
Kp
b92a7d14be
Move register_program into subclass
2013-03-02 23:58:29 +00:00
Kp
13bb74f9ca
Move net_udp.c reference to subclass
2013-03-02 23:17:38 +00:00
Kp
e2c8e95cfc
Move names of platform-specific sources into subclasses
2013-03-02 23:00:10 +00:00
Kp
2851dac581
Combine platform-specific settings construction
2013-03-03 01:54:44 +00:00
Kp
e5b4664555
Use pkg-config to get libSDL settings
2013-03-03 01:52:59 +00:00
Kp
b1b9775052
Copy source lists into individual program objects
...
This is required once unification begins.
2013-03-02 22:41:05 +00:00
Kp
ef996d2772
Generate resource file at build time
2013-03-02 21:25:47 +00:00
Kp
6acace06f4
Move SCons rules into wrapper classes
2013-02-25 02:01:28 +00:00
Kp
cbbc9740ae
Remove ineffective LINKFLAGS assignment
2013-02-25 02:01:28 +00:00
Kp
8d07bf2b38
Move platform-specific settings into specialized settings classes
2013-02-25 02:01:28 +00:00
Kp
6ef163d02c
Collapse ogldefines handling
...
ogldefines is always set to ['OGL'], so remove the definitions of it and
just set that value explicitly when OpenGL is used
2013-02-25 02:01:28 +00:00
Kp
35141d190c
Simplify copying in compiler environment variables
2013-02-25 02:01:28 +00:00
Kp
e2e89ec8f5
Move command line settable values into class Settings
2013-02-25 02:01:28 +00:00
Kp
38ce033428
Overload argument lookup to allow version-specific names
2013-02-25 02:01:28 +00:00
Kp
d14a6860a4
Rename D1XMAJORi/D1XMINORi/D1XMICROi to DXX_VERSION_MAJORi/DXX_VERSION_MINORi/DXX_VERSION_MICROi
2013-02-25 02:01:28 +00:00
Kp
f75513e03d
Rename D1XMAJOR/D1XMINOR/D1XMICRO to VERSION_MAJOR/VERSION_MINOR/VERSION_MICRO
2013-02-25 02:01:28 +00:00
Kp
4f85c21f13
Fix incorrect usage of no_asm in SConstruct
...
zico switched the variable to 'asm' in dac257e
, so referring to no_asm
has no effect now.
2013-02-24 05:14:11 +00:00
Kp
fd22ea5726
Normalize comments and whitespace to match D2X
2013-02-21 00:20:52 +00:00
Kp
7f137ac493
Move arch_sdlmixer to the same relative position as in D2X SConstruct
2013-02-21 00:14:04 +00:00
Kp
4167cf9685
Move main/hash.c -> misc/hash.c to match D2X
2013-02-21 00:13:56 +00:00
zicodxx
fb9c3b8cce
Patch by A Future Pilot to hopefully fix bug which prevented building source within MinGW if Visual Studio installed
2013-01-08 17:53:10 +01:00
zicodxx
495333522d
Some Sconstruct lovin': Respect LDFLAGS; Made D1XMAJORi/MINORi/MICROi compile time constants; Do not pass CFLAGS to CXX; Mark some more warnings as errors - patches by Kp
2012-07-28 01:41:30 +02:00
Kp
a1c07a6bc9
Add support for linking under an alternate name
2013-05-05 22:59:09 +00:00
Kp
88946d5c9b
Add support for DESTDIR installs
2013-05-05 22:55:16 +00:00
Kp
7d140363ab
Allow user to suppress install target
2013-05-05 22:50:19 +00:00
Kp
e0a14391d1
Simplify reading $LDFLAGS
2013-05-05 23:33:38 +00:00
Kp
969c976b82
Restore Raspberry Pi support lost in ed33108
...
Patch by derhass.
2013-05-03 22:52:57 +00:00
Kp
119a34e9cb
Support cross-configuring SDL
2013-04-20 20:36:02 +00:00
Kp
f387c32734
Store fixed values at class scope
2013-04-20 20:36:02 +00:00
Kp
2f6ac3cb53
Refactor SConstruct register_program handling
2013-04-20 20:36:02 +00:00
Kp
621c82f631
Move compiler flags/selection into a base class above DXXProgram
2013-04-20 20:36:02 +00:00
Kp
078ee16905
Remove -pedantic
...
It warns about the editor build and serves no purpose.
2013-04-20 20:36:02 +00:00
Chris Taylor
4d6d655072
For SCons in Mac OS X, make sure the frameworks are linked properly
2013-04-08 17:21:00 +08:00
Chris Taylor
f566bd1203
For Mac, in SCons link against physfs properly
2013-04-08 14:52:04 +08:00
Chris Taylor
bf401f7c74
Allow SCons to find the HIServices framework for the Mac code in physfsx.c
2013-04-08 14:51:38 +08:00
Kp
1e3f1c658e
Allow user to override Raspberry Pi defaults
2013-03-16 17:18:33 +00:00
Kp
b4073678bd
Set Environment tools= from platform settings
...
This allows Linux and Darwin to pass None instead of ['mingw32'].
2013-04-07 17:04:16 +00:00
Kp
2a85e25015
Move Darwin version handling into DarwinPlatformSettings
2013-04-07 17:03:58 +00:00
Kp
3062b23bd0
Add support for out-of-tree build
2013-03-16 18:24:52 +00:00
Chris Taylor
c1280966f1
Updated Xcode project, changed references to error.h to dxxerror.h, since it was renamed
2013-04-06 11:21:32 +08:00
Chris Taylor
a90a86ded6
For the assembler build, make sure platform_settings is accessed from self, likely preventing a compiling error
2013-04-06 10:08:09 +08:00
Kp
792d78e6e8
Support extra information, such as git describe, in version string
2013-03-31 20:42:14 +00:00
Kp
49b25a83eb
Remove unused hostage dialog editor
2013-03-24 02:28:34 +00:00
Kp
a45411b31f
Switch from C99 to Gnu99 to make editor build work
2013-03-09 22:11:54 +00:00
Kp
d6dba018c7
Remove -D_REENTRANT and instead pass -pthread
...
Pass -pthread to let gcc define threading, instead of using -D_REENTRANT
directly.
2013-03-03 22:24:12 +00:00
Kp
3fdb558ecb
Move compiler flags out of SConstruct preprocessor line
2013-03-03 22:23:44 +00:00
Kp
22d38bcace
Prepare for files to be in a subdirectory
2013-03-03 02:20:54 +00:00
Kp
67f433b3f1
Move register_program into subclass
2013-03-02 23:58:29 +00:00
Kp
b77e563e50
Move net_udp.c reference to subclass
2013-03-02 23:17:38 +00:00
Kp
1c52e588df
Move names of platform-specific sources into subclasses
2013-03-02 23:00:10 +00:00
Kp
c03c9f128c
Combine platform-specific settings construction
2013-03-03 01:54:44 +00:00
Kp
c282e0b852
Use pkg-config to get libSDL settings
2013-03-03 01:52:59 +00:00
Kp
39bbc74872
Copy source lists into individual program objects
...
This is required once unification begins.
2013-03-02 22:41:05 +00:00