Commit graph

2960 commits

Author SHA1 Message Date
Kp 139ed37bc8 Move */include/gr.h -> common/include/gr.h 2013-03-03 01:03:33 +00:00
Kp 9a236566b8 Move */include/args.h -> common/include/args.h 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 0c2a08ec01 Move */include/physfsx.h -> common/include/physfsx.h 2013-03-03 01:03:33 +00:00
Kp 2afbfda4ee Move */include/ignorecase.h -> common/include/ignorecase.h 2013-03-03 01:03:33 +00:00
Kp a05d292255 Move */include/u_mem.h -> common/include/u_mem.h
The Descent I reference to virtual_memory_on is unused, so drop it.
2013-03-03 01:03:33 +00:00
Kp d9ee4c7dce Move */include/strutil.h -> common/include/strutil.h 2013-03-03 01:03:33 +00:00
Kp d99d197f8d Move */include/iff.h -> common/include/iff.h 2013-03-03 01:03:33 +00:00
Kp 781d4abdf2 Move */include/rle.h -> common/include/mouse.h 2013-03-03 01:03:33 +00:00
Kp 8298b3c7e6 Move */arch/include/mouse.h -> common/include/mouse.h 2013-03-03 01:03:33 +00:00
Kp 10260197f6 Move */arch/include/joy.h -> common/include/joy.h 2013-03-03 01:03:33 +00:00
Kp 896865c4c4 Move */arch/include/digi_mixer_music.h -> common/include/digi_mixer_music.h 2013-03-03 01:03:33 +00:00
Kp 94e1ee629a Move */arch/include/digi_mixer.h -> common/include/digi_mixer.h 2013-03-03 01:03:33 +00:00
Kp c6e0882f51 Move */arch/include/digi_audio.h -> common/include/digi_audio.h 2013-03-03 01:03:33 +00:00
Kp 27953049cf Move */arch/include/event.h -> common/include/event.h 2013-03-03 01:03:33 +00:00
Kp 9bc42c0b32 Move */include/timer.h -> common/include/timer.h 2013-03-03 01:03:33 +00:00
Kp f2fef2eef5 Move */include/byteswap.h -> common/include/byteswap.h 2013-03-03 01:03:33 +00:00
Kp 204b1e4700 Move */include/console.h -> common/include/console.h 2013-03-03 01:03:33 +00:00
Kp 6555abf09e Move */include/hmp.h -> common/include/hmp.h 2013-03-03 01:03:33 +00:00
Kp ac1af0a58a Move */include/vecmat.h -> common/include/vecmat.h 2013-03-03 01:03:33 +00:00
Kp ba96e9c7ff Move */include/internal.h -> common/include/internal.h 2013-03-03 01:03:33 +00:00
Kp 88371ff28a Move */include/fix.h -> common/include/fix.h 2013-03-03 01:03:33 +00:00
Kp 85c66cad08 Move */include/maths.h -> common/include/maths.h 2013-03-03 01:03:33 +00:00
Kp 4044caeb2d Move */include/dxxerror.h -> common/include/dxxerror.h 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 8cd777160d Merge branch 'unify-d2x-rebirth' into unify 2013-02-19 00:35:36 +00:00
Kp beb0690633 Move d1x-rebirth source into subdirectory d1x-rebirth 2013-02-19 00:34:46 +00:00
Kp 6ac6cf91ac Remove unused file 2d/tmerge.c 2013-03-03 23:59:29 +00:00
Kp 633ea033c4 Use #ifdef, not #if, to test WORDS_BIGENDIAN
On little endian machines, WORDS_BIGENDIAN is undefined, so testing
using #if triggers warning -Wundef.
2013-03-03 23:46:22 +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 ccc104dbb1 Push down inclusion "args.h" from physfsx.h into sources
This is not needed for the header, and makes the header non-common.
2013-03-03 19:41:09 +00:00
Kp 7cda97cc74 Move d2x-rebirth source into subdirectory d2x-rebirth 2013-02-19 00:34:46 +00:00
Kp 76296effd5 Remove unused file 2d/tmerge.c 2013-03-03 23:59:29 +00:00
Kp 06a5fa1407 Remove unused file misc/byteswap.c 2013-03-03 23:54:12 +00:00
Kp 9edfd78dcc Use #ifdef, not #if, to test WORDS_BIGENDIAN
On little endian machines, WORDS_BIGENDIAN is undefined, so testing
using #if triggers warning -Wundef.
2013-03-03 23:46:22 +00:00
Kp ac82280250 Remove unnecessary __pack__ on Arg 2013-03-03 22:46:50 +00:00
Kp b9d5e894b9 Reorder Descent II specific arguments to be together 2013-03-03 22:46:28 +00:00
Kp ae72cf6700 Remove unnecessary prototype of AppendIniArgs 2013-03-03 22:43:40 +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 5f7853fa57 Remove inferno.h include of pstypes.h
Also remove unused macros WIN and WINDOS.
2013-03-03 19:58:10 +00:00
Kp 8d39b2b7ae Push down inclusion "args.h" from physfsx.h into sources
This is not needed for the header, and makes the header non-common.
2013-03-03 19:41:09 +00:00
Kp f3562a1a38 Rename include/error.h to include/dxxerror.h
Avoid conflict with generic system header.
2012-07-07 18:35:06 +00:00
Kp 6ee5bbc03e Remove obsolete include/archinc.h 2013-03-03 17:50:54 +00:00
Kp d920420cf6 Remove unnecessary program-specific references in pstypes.h 2013-03-03 01:01:28 +00:00
Kp a4068234b4 Normalize whitespace in copyright header to match D2X-Rebirth 2013-02-24 02:39:48 +00:00
Kp 9b8af60c2c Prepare for files to be in a subdirectory 2013-03-03 02:20:54 +00:00