Kp
18a42e3e40
Move common/2d/rle.c -> common/2d/rle.cpp
2013-07-27 22:30:54 +00:00
Kp
a334ad0ab1
Move common/2d/rect.c -> common/2d/rect.cpp
2013-07-27 22:30:54 +00:00
Kp
63acd159cc
Move common/2d/pixel.c -> common/2d/pixel.cpp
2013-07-27 22:30:54 +00:00
Kp
c80a824136
Move common/2d/line.c -> common/2d/line.cpp
2013-07-27 22:30:54 +00:00
Kp
5832f0dbd9
Move common/2d/gpixel.c -> common/2d/gpixel.cpp
2013-07-27 22:30:54 +00:00
Kp
139a80b925
Move common/2d/disc.c -> common/2d/disc.cpp
2013-07-27 22:30:54 +00:00
Kp
46d02518bc
Move common/2d/circle.c -> common/2d/circle.cpp
2013-07-27 22:30:54 +00:00
Kp
b7abe1d77e
Move common/2d/canvas.c -> common/2d/canvas.cpp
2013-07-27 22:30:54 +00:00
Kp
6169fc5abc
Move common/2d/box.c -> common/2d/box.cpp
2013-07-27 22:30:54 +00:00
Kp
f7a030483f
Move common/2d/bitmap.c -> common/2d/bitmap.cpp
2013-07-27 22:30:53 +00:00
Kp
c2895e5176
Move common/2d/bitblt.c -> common/2d/bitblt.cpp
2013-07-27 22:30:53 +00:00
Kp
ff90315978
Use SConscript configure support to probe for format(printf) attribute
2013-07-27 22:17:13 +00:00
Kp
77d69d0384
Move configure step to DXXArchive
...
Run the tests once instead of twice.
2013-07-27 22:16:14 +00:00
Kp
2215c0848d
Use SConscript configure support to probe for format_arg attribute
2013-07-26 02:54:33 +00:00
Kp
4725ca5f73
Move */main/songs.c -> similar/main/songs.c
2013-07-24 01:43:02 +00:00
Kp
f84884cfa0
Move */main/gauges.c -> similar/main/gauges.c
2013-07-24 01:27:35 +00:00
Kp
0c689e23e0
Remove unused -DPROGRAM_NAME
2013-07-21 22:00:46 +00:00
Kp
4577dd3977
Merge branch 'd2x-rebirth/master' into unification/master
2013-07-21 21:34:46 +00:00
Kp
012d8e249b
Merge branch d1x-rebirth/master into unification/master
2013-07-19 22:32:28 +00:00
zico
e579dd0a8d
Set release info to 0.58
2013-07-19 16:16:08 +02:00
zico
0f4524c05e
Set release info to 0.58
2013-07-19 16:15:49 +02:00
Kp
25ddc61bc6
Remove argumentIndirection
2013-07-04 03:29:04 +00:00
Kp
3ef181e5ce
Make UserSettings.BIN_DIR a property
2013-07-04 03:29:02 +00:00
Kp
9a5ed90100
Mark SDL-only builds in generated directory name
2013-07-04 03:29:01 +00:00
Kp
cd72fd6b0e
Avoid leading/trailing dashes in derived builddir names
2013-07-04 02:27:50 +00:00
Kp
ff9d36057b
Include more compiler flags in CRC field
2013-07-04 02:27:07 +00:00
Kp
14b7eb7e17
Remove obsolete VariantDir usage
2013-06-29 22:42:52 +00:00
Kp
e1a596bf2f
Move LIBS handling into SConstruct environment
2013-06-29 21:04:00 +00:00
Kp
4d083bce98
Use program.srcdir, not self.srcdir for Win32PlatformSettings
2013-06-28 19:13:39 +00:00
Kp
74965f466d
Remove unused -DPROGRAM_NAME
2013-06-16 18:54:58 +00:00
Kp
1aeffee153
Add Win32PlatformSettings.__init__ to fix SConstruct for Windows
2013-06-11 02:28:07 +00:00
Kp
47d8ca0713
Restore use of Windows icon file
2013-06-02 22:08:50 +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
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
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
2d14584877
Remove unused double-linked list code
2013-07-10 21:44:38 -05:00
Kp
cfc74ba3df
Remove unused graphics code
2013-07-10 21:41:29 -05:00
Kp
2b20eeb6e2
Work around ntpath handling of None
2013-06-28 21:26:42 +00:00
Kp
9b8831c9c5
Use program.srcdir, not self.srcdir for Win32PlatformSettings
2013-06-28 19:16:03 +00:00
Kp
1959e479ef
Remove unused -DPROGRAM_NAME
2013-06-16 18:54:58 +00:00
Kp
d1e260e582
Add Win32PlatformSettings.__init__ to fix SConstruct for Windows
2013-06-11 02:27:59 +00:00
Kp
6914285892
Restore use of Windows icon file
2013-06-02 22:10:32 +00: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
Kp
f9397bdfc5
Generate resource file at build time
2013-03-02 21:25:47 +00:00
Kp
ed33108ae7
Move SCons rules into wrapper classes
2013-02-25 01:59:08 +00:00
Kp
96bf0f5bee
Remove ineffective LINKFLAGS assignment
2013-02-25 01:59:08 +00:00
Kp
dbf90c43db
Move platform-specific settings into specialized settings classes
2013-02-25 01:59:08 +00:00
Kp
e14d2ad601
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 01:59:08 +00:00
Kp
857c8d30ac
Simplify copying in compiler environment variables
2013-02-25 01:59:08 +00:00
Kp
87ac6ea221
Move command line settable values into class Settings
2013-02-25 01:59:08 +00:00
Kp
f702d92c5a
Overload argument lookup to allow version-specific names
2013-02-25 01:59:08 +00:00
Kp
93a23298ff
Rename D2XMAJORi/D2XMINORi/D2XMICROi to DXX_VERSION_MAJORi/DXX_VERSION_MINORi/DXX_VERSION_MICROi
2013-02-25 01:59:08 +00:00
Kp
5e7db3626a
Rename D2XMAJOR/D2XMINOR/D2XMICRO to VERSION_MAJOR/VERSION_MINOR/VERSION_MICRO
2013-02-25 01:59:08 +00:00
Kp
2c5ecf0829
Revert "Move main/bmread.c to be sorted in SConstruct"
...
This reverts commit e3dd328e66
.
Folding hid that this move migrated bmread.c from common_sources to
editor_sources.
2013-02-25 01:59:05 +00:00
Kp
839c8d3c43
Normalize comments and whitespace to match D1X
2013-02-21 00:25:12 +00:00
Kp
e3dd328e66
Move main/bmread.c to be sorted in SConstruct
2013-02-21 00:25:12 +00:00
zicodxx
125fbb0ab8
Support for Raspberry Pi - patch by derhass
2013-01-22 00:34:06 +01:00
zicodxx
fa3a0c60fc
Patch by A Future Pilot to hopefully fix bug which prevented building source within MinGW if Visual Studio installed
2013-01-08 17:53:12 +01:00
zicodxx
f41c2443b3
Some Sconstruct lovin': Respect LDFLAGS; Made D2XMAJORi/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:40 +02:00
Kp
7885199dbd
Use SCons command parsing to generate help text
2013-06-16 02:40:05 +00:00
Kp
6d7b9fbb44
Show instance numbers on DXXProgram runs
2013-06-16 19:28:38 +00:00
Kp
06ad80b93a
Show prefix list for each program target
2013-06-16 19:07:58 +00:00
Kp
a93813ba18
Move argumentIndirection(prefix) up to DXXProgram
2013-06-16 18:33:02 +00:00
Kp
2bb66f28bc
Defer PlatformSettings env back to program env
2013-06-16 17:01:47 +00:00
Kp
a2b7e663df
Move */main/weapon.c -> similar/main/weapon.c
2013-03-03 01:03:33 +00:00
Kp
a10dbc7d4b
Move 2d/2dsline.c -> 2d/2dsline.cpp
2012-11-11 22:12:51 +00:00
Kp
20d4a9a7cd
Move CPPFLAGS handling into SConstruct environment
2013-06-01 23:46:05 +00:00
Kp
0ef55c0abb
Force CRC to be positive
2013-06-05 01:38:05 +00:00
Kp
a49aff4897
Restore use of Windows icon file
2013-06-02 21:46:32 +00:00
Kp
7cf3400df7
Handle RC in SConstruct environment
2013-06-01 23:46:05 +00:00
Kp
3e29fdb80e
Move LDFLAGS handling into SConstruct environment
2013-06-01 23:46:05 +00:00
Kp
6cc175d9a3
Move CPPPATH to base class
2013-05-11 18:35:01 +00:00
Kp
a6afaceb00
Add syntax for configuration fan-out
2013-05-18 03:08:05 +00:00
Kp
18d8ee86be
Modify builddir name based on CFLAGS used
2013-05-18 02:37:19 +00:00
Kp
7933888adc
Allow CC=, CFLAGS= arguments
2013-05-18 02:15:01 +00:00
Kp
d4b06ad757
Move argument processing to table form
2013-05-12 03:16:24 +00:00
Kp
336bd53960
Move Raspberry Pi magic setup to class properties
2013-05-12 01:03:37 +00:00
Kp
445bf546ba
Rename UserSettings.platform_name to host_platform
...
Match the name of the command line argument.
2013-05-12 00:53:06 +00:00
Kp
0e81c0594e
Move settings that affect the build to UserBuildSettings
2013-05-11 23:52:32 +00:00
Kp
05a8aaccaf
Move */arch/sdl/digi_audio.c -> similar/arch/sdl/digi_audio.c
2013-03-03 01:03:33 +00:00
Kp
b09f96b31f
Move */arch/sdl/digi.c -> similar/arch/sdl/digi.c
2013-03-03 01:03:33 +00:00
Kp
544a07bffa
Move */2d/palette.c -> similar/2d/palette.c
2013-03-03 01:03:33 +00:00
Kp
61001e1d94
Move */2d/pcx.c -> similar/2d/pcx.c
2013-03-03 01:03:33 +00:00
Kp
606a455c88
Move */2d/font.c -> similar/2d/font.c
2013-03-03 01:03:33 +00:00
Kp
8d6698b4e6
Move */misc/args.c -> similar/misc/args.c
2013-03-03 01:03:33 +00:00
Kp
e18fc92b68
Move */main/gamecntl.c -> similar/main/gamecntl.c
2013-03-03 01:03:33 +00:00
Kp
c49fb2a68d
Move */main/state.c -> similar/main/state.c
2013-03-03 01:03:33 +00:00
Kp
9fe359baae
Move */main/game.c -> similar/main/game.c
2013-03-03 01:03:33 +00:00
Kp
d607792030
Move */main/gameseg.c -> similar/main/gameseg.c
2013-03-03 01:03:33 +00:00
Kp
fd710386b5
Move */main/gamerend.c -> similar/main/gamerend.c
2013-03-03 01:03:33 +00:00
Kp
1e0f0c8f1b
Move */main/cntrlcen.c -> similar/main/cntrlcen.c
2013-03-03 01:03:33 +00:00
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
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
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
Kp
ccbb392fd4
Move */main/lighting.c -> similar/main/lighting.c
2013-03-03 01:03:33 +00:00
Kp
e1c6fd9690
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
Kp
0952484183
Move part of */main/hostage.c -> similar/main/hostage.c
2013-03-03 01:03:33 +00:00
Kp
acbe1209e8
Move */arch/sdl/digi_mixer.c -> similar/arch/sdl/digi_mixer.c
2013-03-03 01:03:33 +00:00
Kp
2679c2be10
Move */editor/texpage.c -> similar/editor/texpage.c
2013-03-03 01:03:33 +00:00
Kp
a27d667716
Move */editor/medrobot.c -> similar/editor/medrobot.c
2013-03-03 01:03:33 +00:00
Kp
8263b74663
Move */editor/centers.c -> similar/editor/centers.c
2013-03-03 01:03:33 +00:00
Kp
40c71caf92
Move */main/credits.c -> similar/main/credits.c
2013-03-03 01:03:33 +00:00
Kp
a622ccf07f
Move */main/player.c -> similar/main/player.c
2013-03-03 01:03:33 +00:00
Kp
a42e743694
Move */main/effects.c -> similar/main/effects.c
2013-03-03 01:03:33 +00:00
Kp
828452910a
Move */main/digiobj.c -> similar/main/digiobj.c
2013-03-03 01:03:33 +00:00
Kp
29c9334261
Move */main/vclip.c -> similar/main/vclip.c
2013-03-03 01:03:33 +00:00
Kp
543f6002b8
Move */main/texmerge.c -> similar/main/texmerge.c
2013-03-03 01:03:33 +00:00
Kp
83ba5b6241
Move */main/terrain.c -> similar/main/terrain.c
2013-03-03 01:03:33 +00:00
Kp
2b613ee05a
Move */main/slew.c -> similar/main/slew.c
2013-03-03 01:03:33 +00:00
Kp
6025ceaa80
Remove two-stage definition of lazy objects
2013-03-24 23:03:46 +00:00
Kp
c94b48ca33
Use lazy object property for more source lists
2013-03-24 23:03:46 +00:00
Kp
996cb3ee99
Move */main/scores.h -> similar/main/scores.h
2013-03-03 01:03:33 +00:00
Kp
21c078df5b
Move */main/paging.c -> similar/main/paging.c
2013-03-03 01:03:33 +00:00
Kp
5cf2b5873b
Move */main/newmenu.c -> similar/main/newmenu.c
2013-03-03 01:03:33 +00:00
Kp
cb64b8540b
Move */main/morph.c -> similar/main/morph.c
2013-03-03 01:03:33 +00:00
Kp
85c4602199
Move */main/mglobal.c -> similar/main/mglobal.c
2013-03-03 01:03:33 +00:00
Kp
5fa1819e63
Move */main/kmatrix.c -> similar/main/kmatrix.c
2013-03-03 01:03:33 +00:00
Kp
c48a9ea87d
Move */main/hud.c -> similar/main/hud.c
2013-03-03 01:03:33 +00:00
Kp
f418785edc
Move */main/gamefont.c -> similar/main/gamefont.c
2013-03-03 01:03:33 +00:00
Kp
1b69757872
Allow user to override endian check for cross-compilation
2013-03-23 02:46:45 +00:00
Kp
76f25e8d7c
Support cross-configuring SDL
2013-03-17 03:29:48 +00:00
Kp
b5001feb2f
Move */editor/objpage.c -> similar/editor/objpage.c
2013-03-03 01:03:33 +00:00
Kp
7224dde00a
Move */editor/seguvs.c -> similar/editor/seguvs.c
2013-03-03 01:03:33 +00:00
Kp
93d6dc54bd
Move */editor/segment.c -> similar/editor/segment.c
2013-03-03 01:03:33 +00:00
Kp
47b6daaa7a
Move */editor/mine.c -> similar/editor/mine.c
2013-03-03 01:03:33 +00:00
Kp
cd4b771b30
Move */editor/medwall.c -> similar/editor/medwall.c
2013-03-03 01:03:33 +00:00
Kp
5722aee654
Move */editor/meddraw.c -> similar/editor/meddraw.c
2013-03-03 01:03:33 +00:00
Kp
fa8217ff13
Move */editor/med.c -> similar/editor/med.c
2013-03-03 01:03:33 +00:00
Kp
631bc1e3a6
Move */editor/group.c -> similar/editor/group.c
2013-03-03 01:03:33 +00:00
Kp
75fc0d5e8a
Move */editor/ksegsize.c -> similar/editor/ksegsize.c
2013-03-03 01:03:33 +00:00
Kp
931b944cba
Move */editor/kgame.c -> similar/editor/kgame.c
2013-03-03 01:03:33 +00:00
Kp
1c7c90d038
Move */editor/eswitch.c -> similar/editor/eswitch.c
2013-03-03 01:03:33 +00:00
Kp
4ba0495b0a
Move */editor/eobject.c -> similar/editor/eobject.c
2013-03-03 01:03:33 +00:00
Kp
0d8cf57ab0
Move */editor/eglobal.c -> similar/editor/eglobal.c
2013-03-03 01:03:33 +00:00
Kp
043f12db26
Move */editor/curves.c -> similar/editor/curves.c
2013-03-03 01:03:33 +00:00
Kp
a4277df58f
Merge branch 'unify-d2x-rebirth' into unify
...
Conflicts:
SConstruct
common/include/editor/editor.h
d2x-rebirth/editor/ehostage.c
d2x-rebirth/include/d_glob.h
d2x-rebirth/include/d_io.h
d2x-rebirth/main/desc_id.h
d2x-rebirth/main/gamestat.h
d2x-rebirth/main/link.bat
2013-03-31 17:24:44 +00:00
Kp
5c5618f671
Merge branch 'unify-d1x-rebirth' into unify
...
Conflicts:
SConstruct
common/main/vers_id.h
d1x-rebirth/include/alloca.h
d1x-rebirth/include/bcd.h
d1x-rebirth/include/clipboard.h
d1x-rebirth/include/compare.h
d1x-rebirth/include/tracker/tracker.h
d1x-rebirth/main/desc_id.h
d1x-rebirth/main/script.h
2013-03-31 17:21:59 +00:00
Kp
53c19f14f1
Move */editor/kmine.c -> similar/editor/kmine.c
2013-03-17 23:01:33 +00:00
Kp
7cb761f0a3
Move */editor/ksegmove.c -> similar/editor/ksegmove.c
2013-03-17 23:01:33 +00:00
Kp
4aeeab376b
Move */editor/ksegsel.c -> similar/editor/ksegsel.c
2013-03-17 23:01:33 +00:00
Kp
1692f38127
Move */editor/ktmap.c -> similar/editor/ktmap.c
2013-03-17 23:01:33 +00:00
Kp
baf0da84d2
Move */editor/kview.c -> similar/editor/kview.c
2013-03-17 23:01:33 +00:00
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