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
|
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 |
|
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 |
|
Kp
|
e66b36de14
|
Move */arch/sdl/gr.c -> similar/arch/sdl/gr.c
|
2013-03-17 23:01:32 +00:00 |
|
Kp
|
6ef38884e1
|
Move */arch/sdl/key.c -> similar/arch/sdl/key.c
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
ddb26fa198
|
Move */arch/sdl/event.c -> similar/arch/sdl/event.c
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
b5c3902697
|
Move */arch/sdl/init.c -> similar/arch/sdl/init.c
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
d64f605f54
|
Move */arch/sdl/joy.c -> common/arch/sdl/joy.c
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
4bd3f0dbec
|
Move */arch/sdl/mouse.c -> similar/arch/sdl/mouse.c
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
b14f7c2f5f
|
Move */arch/ogl/gr.c -> similar/arch/ogl/gr.c
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
299b47656b
|
Move */misc/hash.c -> similar/misc/hash.c
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
68fec5f94a
|
Move */misc/physfsx.c -> similar/misc/physfsx.c
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
5c1f0f68cc
|
Move */mem/mem.c -> similar/mem/mem.c
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
78fde624f6
|
Move */arch/sdl/timer.c -> similar/arch/sdl/timer.c
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
ea29654c53
|
Move */arch/sdl/jukebox.c -> similar/arch/sdl/jukebox.c
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
3fe3da9a25
|
Move */arch/ogl/ogl.c -> similar/arch/ogl/ogl.c
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
c34a25e1ed
|
Move */arch/sdl/digi_mixer_music.c -> common/arch/sdl/digi_mixer_music.c
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
0087b144a9
|
Combine SConstruct register_program handling
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
68af7a81ba
|
Move */arch/sdl/rbaudio.c -> common/arch/sdl/rbaudio.c
|
2013-03-17 23:01:30 +00:00 |
|
Kp
|
eb8ebe40b9
|
Move */arch/sdl/window.c -> common/arch/sdl/window.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
504cf23746
|
Move */arch/win32/messagebox.c -> common/arch/win32/messagebox.c
|
2013-03-03 01:03:33 +00:00 |
|