TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
4889 commits 2 branches 28 tags 122 MiB
Commit graph

818 commits

Author SHA1 Message Date
Kp cb8d087007 Allow user to override debug/opt CFLAGS 2013-09-28 23:51:52 +00:00
Kp bca4a99f3e Move */main/laser.c -> similar/main/laser.c 2013-09-21 23:19:38 +00:00
Kp 173a3febc9 Enable -Wpointer-arith 2013-09-15 21:39:18 +00:00
Kp d447d02a1d Move */main/newdemo.c -> similar/main/newdemo.c 2013-09-15 21:34:08 +00:00
Kp aa9127e3c1 Enable -Wwrite-strings 2013-09-15 21:34:03 +00:00
Kp c3bbc41796 Remove !defined(NETWORK) code 
Rebirth has always defined NETWORK, so checking for it clutters the code.
 2013-09-15 21:01:06 +00:00
Kp df69df56dc Remove unused common/ui/popup.cpp 2013-09-07 16:39:25 +00:00
Kp 4e177dd3fa Move common/arch/win32/messagebox.c -> common/arch/win32/messagebox.cpp 2013-09-02 23:59:31 +00:00
Kp cc90678647 Move common/arch/sdl/digi_mixer_music.c -> common/arch/sdl/digi_mixer_music.cpp 2013-09-02 23:59:31 +00:00
Kp d156a4c1ab Simplify D1X hostage handling 2013-09-02 23:59:31 +00:00
Kp c7b9a45f63 Combine D2X ai.c, ai2.c 2013-09-01 23:21:57 +00:00
Kp b7dac2941c Move */main/gamesave.c -> similar/main/gamesave.c 2013-09-01 22:59:55 +00:00
Kp 6386023a86 Remove obsolete arch/linux/include in CPPPATH 2013-09-01 22:22:18 +00:00
Kp bf027e3df0 Move */main/titles.c -> similar/main/titles.c 2013-09-01 22:19:27 +00:00
Kp 801dfbcd81 Move */main/net_udp.c -> similar/main/net_udp.c 2013-09-01 21:51:54 +00:00
Kp 923c2111de Move */main/switch.c -> similar/main/switch.c 2013-09-01 18:42:31 +00:00
Kp 25b7735e44 Move */main/aipath.c -> similar/main/aipath.c 2013-09-01 18:38:37 +00:00
Kp 3554d17614 Move */main/render.c -> similar/main/render.c 2013-09-01 18:22:55 +00:00
Kp f131fcd3da Move */main/menu.c -> similar/main/menu.c 2013-09-01 18:06:24 +00:00
Kp 1fd1aa05bc Move */main/mission.c -> similar/main/mission.c 2013-09-01 17:43:27 +00:00
Kp 24bbd2a76d Move */main/automap.c -> similar/main/automap.c 2013-09-01 17:37:38 +00:00
Kp 7bf5b29be4 Move */main/kconfig.c -> similar/main/kconfig.c 2013-09-01 17:20:07 +00:00
Kp 6e7462134e Print builddir into platform banner 2013-08-27 02:45:31 +00:00
Kp 20fdaa3fa7 Remove duplicate object addition in SConstruct 2013-08-27 02:43:27 +00:00
Kp af52e78a50 Move similar/arch/ogl/ogl.c -> similar/arch/ogl/ogl.cpp 2013-08-24 17:10:35 +00:00
Kp a04cd57d71 Move */main/multi.c -> similar/main/multi.c 2013-08-11 23:46:13 +00:00
Kp 4e6142d779 Move similar/arch/ogl/gr.c -> similar/arch/ogl/gr.cpp 2013-08-10 03:56:14 +00:00
Kp 33aa8937d9 Merge branch d1x-rebirth/master into unification/master 
Conflicts:
	SConstruct
	common/main/multi.h
	similar/main/gamerend.c
 2013-08-09 22:49:04 +00:00
Kp 2cc0068fa9 Move */main/fvi.c -> similar/main/fvi.c 2013-08-09 03:13:33 +00:00
Kp dac15b2eaa Add -Werror=format-security to build 2013-08-08 03:01:47 +00:00
Kp 04949b1f75 Move */main/object.c -> similar/main/object.c 2013-08-07 02:33:18 +00:00
Kp 2c362aae80 Move */main/polyobj.c -> similar/main/polyobj.c 2013-08-07 02:33:18 +00:00
Kp 7983086b40 Move common/editor/func.c -> common/editor/func.cpp 2013-08-04 18:02:42 +00:00
Kp c0c396b4fd Move common/ui/userbox.c -> common/ui/userbox.cpp 2013-08-04 18:02:28 +00:00
Kp 227da67a8d Move common/ui/uidraw.c -> common/ui/uidraw.cpp 2013-08-04 18:02:14 +00:00
Kp 1741f7ec57 Move common/ui/ui.c -> common/ui/ui.cpp 2013-08-04 18:01:59 +00:00
Kp c6c82f44ba Move common/ui/scroll.c -> common/ui/scroll.cpp 2013-08-04 18:01:45 +00:00
Kp 0a9e1a6e9a Move common/ui/radio.c -> common/ui/radio.cpp 2013-08-04 18:01:31 +00:00
Kp 5c32819c39 Move common/ui/popup.c -> common/ui/popup.cpp 2013-08-04 18:01:17 +00:00
Kp 0b36b406d9 Move common/ui/message.c -> common/ui/message.cpp 2013-08-04 18:01:03 +00:00
Kp 3f696829fb Move common/ui/menubar.c -> common/ui/menubar.cpp 2013-08-04 18:00:48 +00:00
Kp fca8ac2012 Move common/ui/menu.c -> common/ui/menu.cpp 2013-08-04 18:00:34 +00:00
Kp a9652f1b9b Move common/ui/listbox.c -> common/ui/listbox.cpp 2013-08-04 18:00:20 +00:00
Kp bf0498ab52 Move common/ui/keytrap.c -> common/ui/keytrap.cpp 2013-08-04 18:00:06 +00:00
Kp 11cb41d024 Move common/ui/keypress.c -> common/ui/keypress.cpp 2013-08-04 17:59:52 +00:00
Kp 1fdc080c17 Move common/ui/keypad.c -> common/ui/keypad.cpp 2013-08-04 17:59:37 +00:00
Kp c2b11da77d Move common/ui/inputbox.c -> common/ui/inputbox.cpp 2013-08-04 17:59:23 +00:00
Kp a9a464ba65 Move common/ui/icon.c -> common/ui/icon.cpp 2013-08-04 17:59:09 +00:00
Kp d66063497b Move common/ui/gadget.c -> common/ui/gadget.cpp 2013-08-04 17:58:55 +00:00
Kp 80b86f3f0d Move common/ui/file.c -> common/ui/file.cpp 2013-08-04 17:58:40 +00:00
Kp ad2d064410 Move common/ui/dialog.c -> common/ui/dialog.cpp 2013-08-04 17:58:26 +00:00
Kp 66874d419e Move common/ui/checkbox.c -> common/ui/checkbox.cpp 2013-08-04 17:58:12 +00:00
Kp 000774f49d Move common/ui/button.c -> common/ui/button.cpp 2013-08-04 17:57:20 +00:00
Kp 17d9dd4f1e Move common/texmap/tmapflat.c -> common/texmap/tmapflat.cpp 2013-08-04 17:57:06 +00:00
Kp 3c2b518d0d Move common/texmap/scanline.c -> common/texmap/scanline.cpp 2013-08-04 17:56:51 +00:00
Kp 33725eb510 Move common/texmap/ntmap.c -> common/texmap/ntmap.cpp 2013-08-04 17:56:36 +00:00
Kp 7412f0bfc1 Move common/misc/strutil.c -> common/misc/strutil.cpp 2013-08-04 17:56:21 +00:00
Kp 90b8cdbb1a Move common/misc/strio.c -> common/misc/strio.cpp 2013-08-04 17:56:05 +00:00
Kp 3e950a6b42 Move common/misc/ignorecase.c -> common/misc/ignorecase.cpp 2013-08-04 17:55:04 +00:00
Kp f8cb11d714 Move common/misc/hmp.c -> common/misc/hmp.cpp 2013-08-04 17:55:00 +00:00
Kp 3ac8fdc032 Move common/misc/error.c -> common/misc/error.cpp 2013-08-03 17:45:23 +00:00
Kp 2932582a2e Move common/maths/vecmat.c -> common/maths/vecmat.cpp 2013-08-03 17:45:23 +00:00
Kp 34f5ee1575 Move common/maths/tables.c -> common/maths/tables.cpp 2013-08-03 17:45:23 +00:00
Kp 1ef771136b Move common/maths/rand.c -> common/maths/rand.cpp 2013-08-03 17:45:23 +00:00
Kp bae5ce9a66 Move common/maths/fixc.c -> common/maths/fixc.cpp 2013-08-03 17:45:23 +00:00
Kp 09b1f8fab7 Move common/arch/sdl/window.c -> common/arch/sdl/window.cpp 2013-08-03 17:45:23 +00:00
Kp 97bea01c80 Move common/arch/sdl/rbaudio.c -> common/arch/sdl/rbaudio.cpp 2013-08-03 17:45:22 +00:00
Kp 9daacbdf81 Move common/arch/sdl/joy.c -> common/arch/sdl/joy.cpp 2013-08-03 17:45:22 +00:00
Kp d97e7b468b Move common/3d/setup.c -> common/3d/setup.cpp 2013-08-03 17:45:22 +00:00
Kp 040216910f Move common/3d/rod.c -> common/3d/rod.cpp 2013-08-03 17:45:22 +00:00
Kp fe9f99ead8 Move common/3d/points.c -> common/3d/points.cpp 2013-08-03 17:45:22 +00:00
Kp eaf449e144 Move common/3d/matrix.c -> common/3d/matrix.cpp 2013-08-03 17:45:22 +00:00
Kp 03832a8752 Move common/3d/instance.c -> common/3d/instance.cpp 2013-08-03 17:45:22 +00:00
Kp 1274540315 Move common/3d/globvars.c -> common/3d/globvars.cpp 2013-08-03 17:45:22 +00:00
Kp eb65b73b2a Move common/3d/draw.c -> common/3d/draw.cpp 2013-08-03 17:45:22 +00:00
zico c21c105405 Setting up release 0.58.1 2013-08-03 14:16:05 +02:00
Kp e961be1c14 u_mem: split memory debugging from NDEBUG 2013-07-28 23:18:44 +00:00
Kp 0a650acbdc Collapse variable groups 2013-07-28 23:12:00 +00:00
Kp adfbb4129d Move common/3d/clipper.c -> common/3d/clipper.cpp 2013-07-27 22:30:54 +00:00
Kp 1259006db5 Move common/2d/scalec.c -> common/2d/scalec.cpp 2013-07-27 22:30:54 +00:00
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