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

561 commits

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