Commit graph

163 commits

Author SHA1 Message Date
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