Commit graph

375 commits

Author SHA1 Message Date
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
Kp 909a5d6847 Show target build directory in non-verbose builds 2013-03-17 23:01:32 +00:00
Kp 54d57a37c9 Add support for out-of-tree build 2013-03-17 23:01:32 +00:00
Kp 6096c63ece Use lazy construction for DXXArchive common objects
These will always be constructed, but using lazy construction simplifies
the code.
2013-03-17 23:01:32 +00:00
Kp 8359c3cdd7 Give DXXArchive a private argument prefix of "common" 2013-03-17 23:01:32 +00:00
Kp afab0f4bb8 Allow user to override Raspberry Pi defaults 2013-03-17 23:01:32 +00:00
Kp a842ddca86 Move */editor/autosave.c -> similar/editor/autosave.c 2013-03-17 23:01:32 +00:00
Kp bd9702463e Move */editor/elight.c -> similar/editor/elight.c 2013-03-17 23:01:32 +00:00
Kp 1aa9ae721e Move */editor/fixseg.c -> similar/editor/fixseg.c 2013-03-17 23:01:32 +00:00
Kp f9f14afec5 Move */editor/func.c -> common/editor/func.c 2013-03-17 23:01:32 +00:00
Kp 756ded6007 Move */editor/info.c -> similar/editor/info.c 2013-03-17 23:01:32 +00:00
Kp a338f81663 Move */editor/kbuild.c -> similar/editor/kbuild.c 2013-03-17 23:01:32 +00:00
Kp af3707d1c0 Move */editor/kcurve.c -> similar/editor/kcurve.c 2013-03-17 23:01:32 +00:00
Kp 6b5336a4b3 Move */editor/kfuncs.c -> similar/editor/kfuncs.c 2013-03-17 23:01:32 +00:00
Kp ead39c4cc8 Move */editor/khelp.c -> similar/editor/khelp.c 2013-03-17 23:01:32 +00:00