Commit graph

3570 commits

Author SHA1 Message Date
Kp a49aff4897 Restore use of Windows icon file 2013-06-02 21:46:32 +00:00
Kp 738fdf41c4 Fix SDL-only D2X build failure 2013-06-03 01:20:26 +00:00
Kp 72eacd118b Move */main/ai.h -> common/main/ai.h 2013-03-03 01:03:33 +00:00
Kp e0dbe97264 Move */main/bm.h -> common/main/bm.h 2013-03-03 01:03:33 +00:00
Kp c1b6f8ef8c Move */main/playsave.h -> common/main/playsave.h 2013-03-03 01:03:33 +00:00
Kp 5d487f4d4d Move */main/state.h -> common/main/state.h 2013-03-03 01:03:33 +00:00
Kp 020cdecf31 Remove d*x-rebirth/main/gamemine.h 2013-03-03 01:03:33 +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 997c35c351 Move */include/loadgl.h -> common/include/loadgl.h 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 306ab24486 Merge branch 'd1x-rebirth/master' into unification/master 2013-06-02 20:13:38 +00:00
Kp 285985b071 Move mine_*info fields into #ifdef EDITOR where they belong 2013-06-01 23:11:29 +00:00
Kp e30828a1f6 Fix mismerge that doubled up jointlist reading
Commit 616a3a6 improperly brought in both D1X and D2X copies of the same
loop, but it is a bug for the loop to be run twice.  This caused the
game to crash during initialization because the file position was not as
expected and the loader error handling is poor.
2013-05-09 23:46:58 +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 c8a8f1847e Merge branch 'd2x-rebirth/master' into unification/master 2013-05-05 22:17:48 +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