From e4e357e3947644157020f3ab3d6946779d1539f9 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 3 Dec 2014 22:59:10 -0800 Subject: [PATCH] flatten Makefile --- .gitignore | 13 +- 2d/Makefile.am | 32 ----- 3d/Makefile.am | 10 -- Makefile.am | 220 +++++++++++++++++++++++++++------- arch/Makefile.am | 7 -- arch/dos/Makefile.am | 20 ---- arch/ggi/Makefile.am | 7 -- arch/linux/Makefile.am | 28 ----- arch/ogl/Makefile.am | 9 -- arch/sdl/Makefile.am | 25 ---- arch/svgalib/Makefile.am | 7 -- arch/win32/Makefile.am | 19 --- configure.ac | 172 ++++++++------------------ console/Makefile.am | 4 - d2x.xcodeproj/project.pbxproj | 140 ++++++++++------------ iff/Makefile.am | 8 -- libmve/Makefile.am | 14 --- main/Makefile.am | 54 --------- main/editor/Makefile.am | 18 --- maths/Makefile.am | 20 ---- mem/Makefile.am | 4 - misc/Makefile.am | 21 ---- texmap/Makefile.am | 30 ----- ui/Makefile.am | 11 -- utilities/Makefile.am | 28 ----- utilities/tex2txb.c | 0 utilities/txb2tex.c | 0 27 files changed, 305 insertions(+), 616 deletions(-) delete mode 100644 2d/Makefile.am delete mode 100644 3d/Makefile.am delete mode 100644 arch/Makefile.am delete mode 100644 arch/dos/Makefile.am delete mode 100644 arch/ggi/Makefile.am delete mode 100644 arch/linux/Makefile.am delete mode 100644 arch/ogl/Makefile.am delete mode 100644 arch/sdl/Makefile.am delete mode 100644 arch/svgalib/Makefile.am delete mode 100644 arch/win32/Makefile.am delete mode 100644 console/Makefile.am delete mode 100644 iff/Makefile.am delete mode 100644 libmve/Makefile.am delete mode 100644 main/Makefile.am delete mode 100644 main/editor/Makefile.am delete mode 100644 maths/Makefile.am delete mode 100644 mem/Makefile.am delete mode 100644 misc/Makefile.am delete mode 100644 texmap/Makefile.am delete mode 100644 ui/Makefile.am delete mode 100644 utilities/Makefile.am mode change 100755 => 100644 utilities/tex2txb.c mode change 100755 => 100644 utilities/txb2tex.c diff --git a/.gitignore b/.gitignore index 637c52c2..d2a1eb67 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,18 @@ config.log config.status config.sub configure -d2x-sdl +d2x +d2x-ggi d2x-gl +d2x-sdl +d2x-svga +hogcreate +hogextract +mveplayer +mvlcreate +mvlextract +tex2txb +txb2tex depcomp install-sh missing @@ -24,3 +34,4 @@ stamp-h1 .deps debian/changelog rpm/d2x.spec +.dirstamp diff --git a/2d/Makefile.am b/2d/Makefile.am deleted file mode 100644 index 15b53d39..00000000 --- a/2d/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -noinst_LIBRARIES = lib2d.a -AM_CPPFLAGS = -I $(top_srcdir)/include - -if USE_ASM -ASM_SRCS = -else -ASM_SRCS = tmerge.c -endif - -if MACDATA -TRANSPARENCY_COLOR = 0 -else -TRANSPARENCY_COLOR = 255 -endif - -lib2d_a_SOURCES = ${ASM_SRCS} \ -2dsline.c box.c disc.c ibitblt.c pcx.c rect.c scalec.c \ -bitblt.c canvas.c font.c line.c pixel.c rle.c \ -bitmap.c circle.c gpixel.c palette.c - -SUFFIXES = .asm -.asm.o: - $(NASM) -dTRANSPARENCY_COLOR=${TRANSPARENCY_COLOR} $(NASMFLAGS) $< -o $@ - -if USE_ASM -lib2d_a_LIBADD = linear.o tmerge_a.o -endif - -EXTRA_DIST = \ -linear.asm scalea.asm tmerge_a.asm \ -bitmap.h clip.h scalea.h \ -poly.c scale.c tmerge.c diff --git a/3d/Makefile.am b/3d/Makefile.am deleted file mode 100644 index 21953546..00000000 --- a/3d/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -noinst_LIBRARIES = lib3d.a -AM_CPPFLAGS = -I $(top_srcdir)/include - -lib3d_a_SOURCES = \ -clipper.c globvars.c interp.c points.c setup.c \ -draw.c instance.c matrix.c rod.c - -EXTRA_DIST = \ -interp.asm \ -clipper.h globvars.h diff --git a/Makefile.am b/Makefile.am index b00b9f24..75b8b010 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,67 +1,205 @@ -DIST_SUBDIRS = 2d 3d arch console iff libmve main maths mem misc texmap utilities +bin_PROGRAMS = @TARGETS@ hogcreate hogextract mveplayer mvlcreate mvlextract txb2tex tex2txb +EXTRA_PROGRAMS = d2x d2x-sdl d2x-gl d2x-ggi d2x-svga + +# Common to all d2x platforms/options + +d2x_CPPFLAGS = -DFL1_WITH_FLAT -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(top_srcdir)/arch/include + +d2x_SOURCES = \ +2d/2dsline.c 2d/box.c 2d/disc.c 2d/ibitblt.c 2d/pcx.c 2d/rect.c 2d/scalec.c \ +2d/bitblt.c 2d/canvas.c 2d/font.c 2d/line.c 2d/pixel.c 2d/rle.c 2d/bitmap.c \ +2d/circle.c 2d/gpixel.c 2d/palette.c \ +3d/clipper.c 3d/globvars.c 3d/interp.c 3d/points.c 3d/setup.c 3d/draw.c 3d/instance.c \ +3d/matrix.c 3d/rod.c \ +arch/sdl/digi.c arch/sdl/init.c arch/sdl/rbaudio.c arch/sdl/timer.c \ +iff/iff.c \ +libmve/decoder16.c libmve/decoder8.c libmve/mve_audio.c libmve/mvelib.c libmve/mveplay.c \ +main/ai.c main/ai2.c main/aipath.c main/automap.c main/bm.c main/cmd.c \ +main/cntrlcen.c main/collide.c main/config.c main/console.c main/controls.c main/credits.c \ +main/crypt.c main/digiobj.c main/effects.c main/endlevel.c main/escort.c main/fireball.c \ +main/fuelcen.c main/fvi.c main/game.c main/gamecntl.c main/gamefont.c main/gamemine.c \ +main/gamepal.c main/gamerend.c main/gamesave.c main/gameseg.c main/gameseq.c main/gauges.c \ +main/hostage.c main/hud.c main/inferno.c main/kconfig.c main/kludge.c main/laser.c \ +main/lighting.c main/menu.c main/mglobal.c main/mission.c main/morph.c main/movie.c \ +main/newdemo.c main/newmenu.c main/object.c main/paging.c main/physics.c main/piggy.c \ +main/player.c main/playsave.c main/polyobj.c main/powerup.c main/render.c main/robot.c \ +main/scores.c main/segment.c main/slew.c main/songs.c main/state.c main/switch.c \ +main/terrain.c main/texmerge.c main/text.c main/titles.c main/vclip.c main/wall.c \ +main/weapon.c \ +maths/vecmat.c maths/rand.c maths/tables.c \ +mem/mem.c \ +misc/args.c misc/error.c misc/strio.c misc/ignorecase.c misc/physfsrwops.c \ +misc/hash.c misc/strutil.c \ +texmap/ntmap.c texmap/scanline.c + +d2x_LDFLAGS = +d2x_LDADD = $(PHYSFS_LIBS) + +if MACDATA +TRANSPARENCY_COLOR = 0 +else +TRANSPARENCY_COLOR = 255 +endif -SUBDIRS = ${DIST_SUBDIRS} @D2X_SUBDIRS@ +SUFFIXES = .asm +.asm.o: +$(NASM) -dTRANSPARENCY_COLOR=${TRANSPARENCY_COLOR} $(NASMFLAGS) $< -o $@ -EXTRA_SUBDIRS = ui include unused debian rpm VisualC VisualCE English.lproj d2x.xcode +if USE_ASM +d2x_LDADD += 2d/linear.o 2d/tmerge_a.o maths/vecmata.o maths/fix.o +else +d2x_SOURCES += 2d/tmerge.c maths/fixc.c +endif -bin_PROGRAMS = @TARGETS@ +if USE_CONSOLE +d2x_SOURCES += console/CON_console.c +endif -EXTRA_PROGRAMS = d2x d2x-sdl d2x-gl d2x-svga d2x-ggi +if USE_NETWORK +d2x_SOURCES += main/kmatrix.c main/multi.c main/multibot.c main/network.c main/netmisc.c +endif -ARCH_LIBS = $(foreach subdir,${D2X_ARCH_SUBDIRS},arch/${subdir}/libarch_${subdir}.a) +if USE_EDITOR +d2x_SOURCES += main/bmread.c main/dumpmine.c \ +main/editor/autosave.c main/editor/centers.c main/editor/curves.c main/editor/eglobal.c \ +main/editor/ehostage.c main/editor/elight.c main/editor/eobject.c main/editor/eswitch.c \ +main/editor/fixseg.c main/editor/func.c main/editor/group.c main/editor/info.c \ +main/editor/kbuild.c main/editor/kcurve.c main/editor/kfuncs.c main/editor/kgame.c \ +main/editor/kgroup.c main/editor/khelp.c main/editor/kmine.c main/editor/ksegmove.c \ +main/editor/ksegsel.c main/editor/ksegsize.c main/editor/ktmap.c main/editor/kview.c \ +main/editor/macro.c main/editor/med.c main/editor/meddraw.c main/editor/medmisc.c \ +main/editor/medrobot.c main/editor/medsel.c main/editor/medwall.c main/editor/mine.c \ +main/editor/objpage.c main/editor/segment.c main/editor/seguvs.c main/editor/texpage.c \ +main/editor/texture.c \ +ui/barbox.c ui/button.c ui/checkbox.c ui/file.c ui/gadget.c ui/icon.c \ +ui/inputbox.c ui/keypad.c ui/keypress.c ui/keytrap.c ui/listbox.c ui/menu.c \ +ui/menubar.c ui/message.c ui/mouse.c ui/number.c ui/popup.c ui/radio.c \ +ui/scroll.c ui/ui.c ui/uidraw.c ui/userbox.c ui/window.c +endif + +if USE_LIBPNG +d2x_SOURCES += misc/pngfile.c +endif + + +# Platform-specific things + +if MSDOS +d2x_CPPFLAGS += -I$(top_srcdir)/arch/dos/include +d2x_SOURCES += arch/dos/digi.c arch/dos/dpmi.c arch/dos/findfile.c arch/dos/gr.c arch/dos/init.c arch/dos/ipx.c arch/dos/joyc.c arch/dos/joydefs.c arch/dos/key.c arch/dos/mouse.c arch/dos/rbaudio.c arch/dos/vesa.c +d2x_LDADD += arch/dos/timer.o arch/dos/modex.o +endif + + +# Remaining targets are based on d2x_* + +d2x_ggi_CPPFLAGS = $(d2x_CPPFLAGS) -DGGI +d2x_ggi_SOURCES = $(d2x_SOURCES) arch/ggi/event.c arch/ggi/gr.c arch/ggi/init.c arch/ggi/key.c arch/ggi/mouse.c +d2x_ggi_LDFLAGS = $(d2x_LDFLAGS) +d2x_ggi_LDADD = $(d2x_LDADD) -lggi -lgii + + +d2x_svga_CPPFLAGS = $(d2x_CPPFLAGS) -DSVGA +d2x_svga_SOURCES = $(d2x_SOURCES) arch/svgalib/event.c arch/svgalib/gr.c arch/svgalib/key.c arch/svgalib/mouse.c arch/svgalib/init.c +d2x_svga_LDFLAGS = $(d2x_LDFLAGS) +d2x_svga_LDADD = $(d2x_LDADD) -lvga -lvgagl + + +d2x_sdl_CPPFLAGS = $(d2x_CPPFLAGS) $(SDL_CFLAGS) +_d2x_sdl_SOURCES = $(d2x_SOURCES) arch/sdl/event.c arch/sdl/key.c arch/sdl/mouse.c +d2x_sdl_SOURCES = $(_d2x_sdl_SOURCES) arch/sdl/gr.c texmap/tmapflat.c +d2x_sdl_LDFLAGS = $(d2x_LDFLAGS) +d2x_sdl_LDADD = $(d2x_LDADD) $(SDL_LIBS) $(SDLIMAGE_LIBS) if MINGW32 -LD_KLUDGE = main/inferno.o +d2x_sdl_CPPFLAGS += -I$(top_srcdir)/arch/win32/include +_d2x_sdl_SOURCES += arch/win32/hmpfile.c arch/win32/midi.c arch/win32/mingw_init.c +d2x_sdl_LDADD += -lwinmm + +if USE_NETWORK +_d2x_sdl_SOURCES += arch/win32/ipx_mcast4.c arch/win32/ipx_win.c arch/win32/ipx_udp.c arch/win32/winnet.c +d2x_sdl_LDADD += -lwsock32 endif -if MACOSX -AM_LDFLAGS = -all_load +else # !MINGW32 + +d2x_sdl_CPPFLAGS += -I$(top_srcdir)/arch/linux/include +_d2x_sdl_SOURCES += arch/linux/init.c +d2x_sdl_LDADD += -lm + +if USE_LINUX_JOY +_d2x_sdl_SOURCES += arch/linux/joystick.c arch/linux/joydefs.c +else +_d2x_sdl_SOURCES += arch/sdl/joy.c arch/sdl/joydefs.c +endif + +if USE_NETWORK +_d2x_sdl_SOURCES += arch/linux/ipx_mcast4.c arch/linux/ipx_udp.c arch/linux/linuxnet.c + +if USE_NATIVE_IPX +_d2x_sdl_SOURCES += arch/linux/ipx_bsd.c endif -if EDITOR -EDITOR_LIBS = main/editor/libeditor.a ui/libui.a +if USE_KALINIX +_d2x_sdl_SOURCES += arch/linux/ipx_kali.c arch/linux/ukali.c endif -if CONSOLE -CONSOLE_LIBS = console/libconsole.a +endif # USE_NETWORK + +endif # !MINGW32 + +if MACOSX +#d2x_sdl_LDFLAGS += -all_load endif -d2x_SOURCES = -d2x_sdl_SOURCES = -d2x_gl_SOURCES = -d2x_svga_SOURCES = -d2x_ggi_SOURCES = -d2x_LDADD = ${LD_KLUDGE} main/libmain.a ${EDITOR_LIBS} 3d/lib3d.a 2d/lib2d.a ${ARCH_LIBS} libmve/libmve.a mem/libmem.a iff/libiff.a texmap/libtexmap.a misc/libmisc.a maths/libmaths.a ${CONSOLE_LIBS} +# GL target is based on d2x_sdl_*, other than renderer + +d2x_gl_CPPFLAGS = $(d2x_sdl_CPPFLAGS) -DOGL +d2x_gl_SOURCES = $(_d2x_sdl_SOURCES) arch/ogl/gr.c arch/ogl/ogl.c arch/ogl/sdlgl.c +d2x_gl_LDFLAGS = $(d2x_sdl_LDFLAGS) +d2x_gl_LDADD = $(d2x_sdl_LDADD) + +if MACOSX +d2x_gl_LDFLAGS += -framework OpenGL +endif if MINGW32 -if USE_NETWORK -d2x_sdl_LDADD = ${d2x_LDADD} -lwinmm -lwsock32 +d2x_gl_LDADD += "-lopengl32 -lglu32" else -d2x_sdl_LDADD = ${d2x_LDADD} -lwinmm +if !MACOSX +d2x_gl_LDADD += -lGL -lGLU endif -else -d2x_sdl_LDADD = ${d2x_LDADD} -lm endif -d2x_gl_LDADD = ${d2x_sdl_LDADD} ${OGL_LIBS} -d2x_svga_LDADD = ${d2x_sdl_LDADD} ${SVGA_LIBS} -d2x_ggi_LDADD = ${d2x_sdl_LDADD} ${GGI_LIBS} -dist-hook: - rm -rf `find $(distdir) -name CVS` -# rm -f `find $(distdir) -name Makefile` + +# Other programs + +mveplayer_SOURCES = libmve/decoder16.c libmve/decoder8.c libmve/mve_audio.c libmve/mve_main.c libmve/mvelib.c libmve/mveplay.c +mveplayer_MANS = libmve/mveplayer.1 +mveplayer_CFLAGS = -I$(top_srcdir)/include $(SDL_CFLAGS) +mveplayer_LDADD = $(SDL_LIBS) + +hogcreate_SOURCES = utilities/hogcreate.c +hogcreate_MANS = utilities/hogcreate.1 + +hogextract_SOURCES = utilities/hogextract.c +hogextract_MANS = utilities/hogextract.1 + +mvlcreate_SOURCES = utilities/mvlcreate.c +mvlcreate_MANS = utilities/mvlcreate.1 + +mvlextract_SOURCES = utilities/mvlextract.c +mvlextract_MANS = utilities/mvlextract.1 + +txb2tex_SOURCES = utilities/txb2tex.c +txb2tex_MANS = utilities/txb2tex.1 + +tex2txb_SOURCES = utilities/tex2txb.c +tex2txb_MANS = utilities/tex2txb.1 + pkgdatadir = @sharepath@ missiondir = ${pkgdatadir}/missions -CLEANFILES = @TARGETS@ Info.plist - -EXTRA_DIST = ${EXTRA_SUBDIRS} \ -ChangeLog ChangeLog-old \ -D2X.make \ -MVEPlayer-Info.plist d2x-Info.plist d2xgl-Info.plist \ -README.utils \ -djgpp.bat djgpp.sh \ -autogen.sh \ -cvshowto.txt readme.txt installation.txt compilerdefs.txt \ -d2x-sdl.sh d2x-gl.sh +CLEANFILES = Info.plist diff --git a/arch/Makefile.am b/arch/Makefile.am deleted file mode 100644 index aa3e58ab..00000000 --- a/arch/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -SUBDIRS = @D2X_ARCH_SUBDIRS@ - -DIST_SUBDIRS = dos ggi linux ogl sdl svgalib win32 - -EXTRA_SUBDIRS = include - -EXTRA_DIST = ${EXTRA_SUBDIRS} diff --git a/arch/dos/Makefile.am b/arch/dos/Makefile.am deleted file mode 100644 index fe56310f..00000000 --- a/arch/dos/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -EXTRA_SUBDIRS = allg_snd bak comm include mm_snd - -noinst_LIBRARIES = libarch_dos.a - -AM_CPPFLAGS = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(srcdir)/include - -libarch_dos_a_SOURCES = \ -digi.c dpmi.c findfile.c gr.c init.c ipx.c joyc.c joydefs.c key.c mouse.c rbaudio.c vesa.c - -SUFFIXES = .asm -.asm.o: - $(NASM) $(NASMFLAGS) $< -o $@ - -libarch_dos_a_LIBADD = timer.o modex.o - -EXTRA_DIST = ${EXTRA_SUBDIRS} \ -tweak.inc vgaregs.inc \ -joy2.asm modex.asm timer.asm \ -bcd.c digiallg.c digimm.c disk.c midiallg.c mono.c serial.c \ -ipx.h mono.h diff --git a/arch/ggi/Makefile.am b/arch/ggi/Makefile.am deleted file mode 100644 index f6e8ae55..00000000 --- a/arch/ggi/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -EXTRA_SUBDIRS = linux - -noinst_LIBRARIES = libarch_ggi.a - -AM_CPPFLAGS = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main - -libarch_ggi_a_SOURCES = event.c gr.c init.c key.c mouse.c diff --git a/arch/linux/Makefile.am b/arch/linux/Makefile.am deleted file mode 100644 index 6745d57a..00000000 --- a/arch/linux/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -EXTRA_SUBDIRS = include - -noinst_LIBRARIES = libarch_linux.a - -AM_CPPFLAGS = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(srcdir)/include - -if USE_NETWORK -NETWORK_SRCS = ipx_mcast4.c ipx_udp.c linuxnet.c -if USE_NATIVE_IPX -IPX_SRCS = ipx_bsd.c -endif -if USE_KALINIX -KALI_SRCS = ipx_kali.c ukali.c -endif -endif - -if USE_LINUX_JOY -JOYSTICK_SRCS = joystick.c joydefs.c -endif - -libarch_linux_a_SOURCES = ${NETWORK_SRCS} ${IPX_SRCS} ${KALI_SRCS} ${JOYSTICK_SRCS} init.c - -EXTRA_libarch_linux_a_SOURCES = \ -ipx_bsd.c ipx_kali.c ipx_mcast4.c ipx_udp.c linuxnet.c ukali.c \ -joydefs.c joystick.c - -EXTRA_DIST = ${EXTRA_SUBDIRS} \ -alsadigi.c hmistub.c hmiplay.c mono.c serial.c timer.c diff --git a/arch/ogl/Makefile.am b/arch/ogl/Makefile.am deleted file mode 100644 index 6752dbe8..00000000 --- a/arch/ogl/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -noinst_LIBRARIES = libarch_ogl.a - -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/arch/include -I$(top_srcdir)/main - -libarch_ogl_a_SOURCES = gr.c ogl.c sdlgl.c - -EXTRA_DIST = \ -internal.h \ -wgl.c glx.c diff --git a/arch/sdl/Makefile.am b/arch/sdl/Makefile.am deleted file mode 100644 index 90b78e7a..00000000 --- a/arch/sdl/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -EXTRA_SUBDIRS = include - -noinst_LIBRARIES = libarch_sdl.a - -AM_CPPFLAGS = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main - -if !USE_LINUX_JOY -JOYSTICK_SRCS = joy.c joydefs.c -endif - -if !USE_SVGALIB -if !USE_GGI -INPUT_SRCS = event.c key.c mouse.c -endif -endif - -if !USE_OPENGL -VIDEO_SRCS = gr.c -endif - -libarch_sdl_a_SOURCES = ${JOYSTICK_SRCS} ${VIDEO_SRCS} ${INPUT_SRCS} \ -digi.c init.c rbaudio.c timer.c - -EXTRA_libarch_sdl_a_SOURCES = \ -event.c gr.c joy.c joydefs.c key.c mouse.c diff --git a/arch/svgalib/Makefile.am b/arch/svgalib/Makefile.am deleted file mode 100644 index 17e6cdc6..00000000 --- a/arch/svgalib/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -EXTRA_SUBDIRS = linux - -noinst_LIBRARIES = libarch_svgalib.a - -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(top_srcdir)/arch/include - -libarch_svgalib_a_SOURCES = event.c gr.c key.c mouse.c init.c diff --git a/arch/win32/Makefile.am b/arch/win32/Makefile.am deleted file mode 100644 index 9893c0fd..00000000 --- a/arch/win32/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -EXTRA_SUBDIRS = include d3dframe - -noinst_LIBRARIES = libarch_win32.a - -AM_CPPFLAGS = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(srcdir)/include - -if USE_NETWORK -NETWORK_SRCS = ipx_mcast4.c ipx_win.c ipx_udp.c winnet.c -endif - -libarch_win32_a_SOURCES = ${NETWORK_SRCS} hmpfile.c midi.c mingw_init.c - -EXTRA_libarch_win32_a_SOURCES = ipx_mcast4.c ipx_win.c ipx_udp.c winnet.c - -EXTRA_DIST = ${EXTRA_SUBDIRS} \ -d1x.ico d1x.rc d3d.ico debug.cpp descent.ico digi.c glinit.c gr.c \ -init.c joydefs.c joyhh.c key.c mono.c mouse.c palw32.c \ -pch.cpp scene.cpp serial.c texture.cpp timer.c win32.c winmain.cpp \ -ipx_drv.h diff --git a/configure.ac b/configure.ac index 7cd0e6b5..e14bc253 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ AC_CANONICAL_TARGET AC_EXEEXT AC_OBJEXT -AM_INIT_AUTOMAKE([1.6]) +AM_INIT_AUTOMAKE([subdir-objects]) AM_CONFIG_HEADER(conf.h) @@ -42,9 +42,9 @@ AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) case $host_cpu in - sparc) - AC_DEFINE(WORDS_NEED_ALIGNMENT,,[Define if your processor needs data to be word-aligned]) - ;; + sparc) + AC_DEFINE(WORDS_NEED_ALIGNMENT,,[Define if your processor needs data to be word-aligned]) + ;; esac case $host_os in @@ -58,8 +58,8 @@ case $host_os in ;; darwin*) MACOSX=yes - CFLAGS="-no-cpp-precomp $CFLAGS" - ;; + CFLAGS="-no-cpp-precomp $CFLAGS" + ;; msdos*) MSDOS=yes ;; @@ -69,16 +69,11 @@ AC_CHECK_DECLS(nanosleep,,,[#include ]) AC_CHECK_TYPES([struct timespec, struct timeval],,,[#include ]) AM_CONDITIONAL(MINGW32, test x$MINGW32 = xyes) -if test x$MINGW32 = xyes; then - GL_LIBS="opengl32 glu32" -elif test x$MACOSX = xyes; then - GL_LIBS="" -else - GL_LIBS="GL GLU" -fi AM_CONDITIONAL(MACOSX, test x$MACOSX = xyes) +AM_CONDITIONAL(MSDOS, test x$MSDOS = xyes) + dnl Set $prefix and $exec_prefix to $ac_default_prefix if they are not set test "x$prefix" = "xNONE" && prefix=$ac_default_prefix test "x$exec_prefix" = "xNONE" && exec_prefix="${prefix}" @@ -88,18 +83,14 @@ default_sharepath="$datadir/games/$PACKAGE" CFLAGS="-Wall -Wno-char-subscripts $CFLAGS" -D2X_SUBDIRS="" -D2X_MAIN_SUBDIRS="" - dnl Enable editor build? AC_ARG_ENABLE(editor, [ --enable-editor Build editor? (not functional)],,) if test x$enable_editor = xyes; then AC_DEFINE(EDITOR,,[Define if you want to build the editor]) - D2X_SUBDIRS="ui ${D2X_SUBDIRS}" - D2X_MAIN_SUBDIRS="editor ${D2X_MAIN_SUBDIRS}" + D2X_FEATURES="editor $D2X_FEATURES" fi -AM_CONDITIONAL(EDITOR, test x$enable_editor = xyes) +AM_CONDITIONAL(USE_EDITOR, test x$enable_editor = xyes) dnl Enable macdata build? AC_ARG_ENABLE(macdata, @@ -142,14 +133,14 @@ dnl Build with FAST_FILE_IO? AC_ARG_ENABLE(fastfileio, [ --disable-fastfileio Disable fast file i/o. ],,) if test x$enable_fastfileio != xno; then - if test x$ac_cv_c_bigendian = xyes; then - AC_MSG_WARN([big-endian cpu detected. disabling fastfileio]) - enable_fastfileio="no"; - fi - if test $ac_cv_sizeof_void_p != 4; then - AC_MSG_WARN([pointers not 32 bits. disabling fastfileio]) - enable_fastfileio="no"; - fi + if test x$ac_cv_c_bigendian = xyes; then + AC_MSG_WARN([big-endian cpu detected. disabling fastfileio]) + enable_fastfileio="no"; + fi + if test $ac_cv_sizeof_void_p != 4; then + AC_MSG_WARN([pointers not 32 bits. disabling fastfileio]) + enable_fastfileio="no"; + fi fi if test x$enable_fastfileio != xno; then AC_DEFINE(FAST_FILE_IO,,[Define for faster i/o on little-endian cpus]) @@ -161,9 +152,10 @@ AC_ARG_ENABLE(console, [ --disable-console Disable graphical console ],,) if test x$enable_console != xno; then AC_DEFINE(CONSOLE,,[Define to enable console]) - D2X_SUBDIRS="console ${D2X_SUBDIRS}" + D2X_FEATURES="console ${D2X_FEATURES}" + fi -AM_CONDITIONAL(CONSOLE, test x$enable_console != xno) +AM_CONDITIONAL(USE_CONSOLE, test x$enable_console != xno) AC_ARG_WITH(sharepath, [[ --with-sharepath=DIR Use DIR for shared game data (unix only) [DATADIR/games/d2x]]], @@ -176,11 +168,11 @@ eval sharepath=$sharepath eval sharepath=$sharepath AC_DEFINE_UNQUOTED(SHAREPATH, "$sharepath",[Define this to be the shared game directory root]) +TARGETS= + # Test for MSDOS if test x$MSDOS = xyes; then - CFLAGS="-I \$(top_srcdir)/arch/dos/include $CFLAGS" - TARGETS=d2x - D2X_ARCH_SUBDIRS=dos + TARGETS="d2x $TARGETS" else CFLAGS="-pipe $CFLAGS" @@ -190,66 +182,45 @@ else :, AC_MSG_ERROR(SDL not found. Make sure sdl-config is in your PATH, or specify with --with-sdl-prefix) ) - CFLAGS="$SDL_CFLAGS $CFLAGS" - LIBS="$SDL_LIBS $LIBS" - TARGETS=d2x-sdl - D2X_ARCH_SUBDIRS=sdl + TARGETS="d2x-sdl $TARGETS" AC_CHECK_HEADERS(netipx/ipx.h) # Check for SDL_image AC_CHECK_LIB(SDL_image, IMG_ReadXPMFromArray, - LIBS="-lSDL_image $LIBS" + SDLIMAGE_LIBS="-lSDL_image" AC_DEFINE(SDL_IMAGE,,[Define if you have the SDL_image library])) + AC_SUBST(SDLIMAGE_LIBS) # Check for libpng have_libpng=no #PKG_CHECK_MODULES(LIBPNG, libpng, - # AC_DEFINE(HAVE_LIBPNG,,[Define if you have libpng]) - # have_libpng=yes - # LIBS="$LIBPNG_LIBS $LIBS", - # AC_MSG_WARN([libpng not found. disabling png replacement texture support]) -#) + # AC_DEFINE(HAVE_LIBPNG,,[Define if you have libpng]) + # have_libpng=yes + # LIBS="$LIBPNG_LIBS $LIBS", + # AC_MSG_WARN([libpng not found. disabling png replacement texture support]) + #) AM_CONDITIONAL(USE_LIBPNG, test x$have_libpng = xyes) # Check for PhysicsFS AC_CHECK_HEADERS(physfs.h, , [AC_MSG_ERROR([physfs.h required])]) - AC_CHECK_LIB(physfs, PHYSFS_init, LIBS="-lphysfs $LIBS", + AC_CHECK_LIB(physfs, PHYSFS_init, PHYSFS_LIBS="-lphysfs", [AC_MSG_ERROR([physfs library required])]) + AC_SUBST(PHYSFS_LIBS) # Check for OpenGL AC_ARG_WITH(opengl, [ --with-opengl Build OpenGL support ],,) if test x$with_opengl = xyes; then - for lib in $GL_LIBS; do - AC_CHECK_LIB($lib, main, - OGL_LIBS="${OGL_LIBS} -l$lib", - [AC_MSG_ERROR([$lib not found, --with-opengl cannot be used]) - opengl=false], - ${OGL_LIBS} - ) - done - AC_DEFINE(OGL,,[Define if you want an OpenGL build]) - TARGETS=d2x-gl - D2X_ARCH_SUBDIRS="ogl ${D2X_ARCH_SUBDIRS}" + TARGETS="d2x-gl $TARGETS" fi - AC_SUBST(OGL_LIBS) - AM_CONDITIONAL(USE_OPENGL, test x$with_opengl = xyes) # Check for GGI AC_ARG_WITH(ggi, [ --with-ggi Build GGI support ],,) if test x$with_ggi = xyes; then - AC_CHECK_LIB(ggi, ggiInit, - GGI_LIBS="-lggi", - [AC_MSG_ERROR([GGI not found, GGI version cannot be built]); ggi=false]) - AC_CHECK_LIB(gii, giiInit, - GGI_LIBS="${GGI_LIBS} -lgii", - [AC_MSG_ERROR([GII not found, GGI version cannot be built]); ggi=false]) - AC_DEFINE(GGI,,[Define if you want a GGI build]) - TARGETS=d2x-ggi - D2X_ARCH_SUBDIRS="ggi ${D2X_ARCH_SUBDIRS}" + TARGETS="d2x-ggi $TARGETS" fi AC_SUBST(GGI_LIBS) AM_CONDITIONAL(USE_GGI, test x$with_ggi = xyes) @@ -258,29 +229,10 @@ else AC_ARG_WITH(svga, [ --with-svga Build SVGALib support ],,) if test x$with_svga = xyes; then - AC_CHECK_LIB(vga,vga_getmousetype, - SVGA_LIBS="-lvga", - [AC_MSG_ERROR([vga not found, SVGALib cannot be built]) - svga=false], - ) - AC_CHECK_LIB(vgagl,gl_getcontext, - SVGA_LIBS="${SVGA_LIBS} -lvgagl", - [AC_MSG_ERROR([vgagl not found, SVGALib cannot be built]) - svga=false], - -lvga) - AC_DEFINE(SVGA,,[Define if you want an SVGALib build]) - TARGETS=d2x-svga - D2X_ARCH_SUBDIRS="svgalib ${D2X_ARCH_SUBDIRS}" + TARGETS="d2x-svga $TARGETS" fi AC_SUBST(SVGA_LIBS) AM_CONDITIONAL(USE_SVGALIB, test x$with_svga = xyes) - - if test x$MINGW32 = xyes; then - D2X_ARCH_SUBDIRS="win32 ${D2X_ARCH_SUBDIRS}" - else - CFLAGS="-I \$(top_srcdir)/arch/linux/include $CFLAGS" - D2X_ARCH_SUBDIRS="linux ${D2X_ARCH_SUBDIRS}" - fi fi dnl Check for network @@ -296,18 +248,18 @@ if test x$enable_network != xno; then enable_native_ipx="no"; ;; esac - case $host_os in - cygwin* | mingw* | msdos*) - enable_kalinix="no"; - ;; - esac + case $host_os in + cygwin* | mingw* | msdos*) + enable_kalinix="no"; + ;; + esac case $host_os in *solaris*) AC_CHECK_LIB(socket, socket, LIBS="${LIBS} -lsocket", - [AC_MSG_ERROR(socket lib required for net support on solaris not found)]) + [AC_MSG_ERROR(socket lib required for net support on solaris not found)]) AC_CHECK_LIB(nsl, inet_addr, LIBS="${LIBS} -lnsl", - [AC_MSG_ERROR(nsl lib required for net support on solaris not found)]) - ;; + [AC_MSG_ERROR(nsl lib required for net support on solaris not found)]) + ;; esac fi AC_ARG_ENABLE(kalinix, @@ -344,8 +296,8 @@ if test x$enable_assembler != xno; then msdos*) NASMFLAGS="-f coff $NASMFLAGS" ;; - linux* | freebsd*) - NASMFLAGS="-f elf -d__ELF__ $NASMFLAGS" + linux* | freebsd*) + NASMFLAGS="-f elf -d__ELF__ $NASMFLAGS" ;; *) AC_MSG_WARN([nasm not supported for this OS. disabling assembler]) @@ -413,12 +365,6 @@ TARGETS="$TARGETS$ac_cv_exeext" AM_PROG_AS -AC_SUBST(D2X_SUBDIRS) - -AC_SUBST(D2X_ARCH_SUBDIRS) - -AC_SUBST(D2X_MAIN_SUBDIRS) - AC_SUBST(TARGETS) AC_SUBST(NASMFLAGS) @@ -427,26 +373,6 @@ AC_SUBST(CFLAGS) AC_OUTPUT( Makefile - 2d/Makefile - 3d/Makefile - arch/Makefile - arch/dos/Makefile - arch/ggi/Makefile - arch/linux/Makefile - arch/ogl/Makefile - arch/sdl/Makefile - arch/svgalib/Makefile - arch/win32/Makefile - console/Makefile - iff/Makefile - libmve/Makefile - main/Makefile - main/editor/Makefile - maths/Makefile - mem/Makefile - misc/Makefile - texmap/Makefile - ui/Makefile utilities/Makefile debian/changelog rpm/d2x.spec @@ -455,8 +381,8 @@ AC_OUTPUT( AC_MSG_RESULT([ d2x has been configured successfully. - Platform(s): $D2X_ARCH_SUBDIRS - Features : $D2X_FEATURES $D2X_SUBDIRS $D2X_MAIN_SUBDIRS + Targets: $TARGETS + Features: $D2X_FEATURES Shared game data directory (unix only): $sharepath ]) diff --git a/console/Makefile.am b/console/Makefile.am deleted file mode 100644 index fb79a7cd..00000000 --- a/console/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -noinst_LIBRARIES = libconsole.a -AM_CPPFLAGS = -I $(top_srcdir)/include -I$(top_srcdir)/arch/include - -libconsole_a_SOURCES = CON_console.c diff --git a/d2x.xcodeproj/project.pbxproj b/d2x.xcodeproj/project.pbxproj index 6898c241..98a976c0 100644 --- a/d2x.xcodeproj/project.pbxproj +++ b/d2x.xcodeproj/project.pbxproj @@ -200,7 +200,6 @@ 146694DC1A2729860070D41D /* ibitblt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ibitblt.c; sourceTree = ""; }; 146694DD1A2729860070D41D /* line.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = line.c; sourceTree = ""; }; 146694DE1A2729860070D41D /* linear.asm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm.asm; path = linear.asm; sourceTree = ""; }; - 146694DF1A2729860070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146694E11A2729860070D41D /* palette.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = palette.c; sourceTree = ""; }; 146694E21A2729860070D41D /* pcx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pcx.c; sourceTree = ""; }; 146694E31A2729860070D41D /* pixel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pixel.c; sourceTree = ""; }; @@ -221,7 +220,6 @@ 146694F31A2729860070D41D /* instance.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = instance.c; sourceTree = ""; }; 146694F41A2729860070D41D /* interp.asm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm.asm; path = interp.asm; sourceTree = ""; }; 146694F51A2729860070D41D /* interp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = interp.c; sourceTree = ""; }; - 146694F61A2729860070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146694F81A2729860070D41D /* matrix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = matrix.c; sourceTree = ""; }; 146694F91A2729860070D41D /* points.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = points.c; sourceTree = ""; }; 146694FA1A2729860070D41D /* rod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rod.c; sourceTree = ""; }; @@ -285,7 +283,6 @@ 146695401A2729860070D41D /* joyc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = joyc.c; sourceTree = ""; }; 146695411A2729860070D41D /* joydefs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = joydefs.c; sourceTree = ""; }; 146695421A2729860070D41D /* key.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = key.c; sourceTree = ""; }; - 146695431A2729860070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146695451A2729860070D41D /* midiallg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = midiallg.c; sourceTree = ""; }; 146695471A2729860070D41D /* drv_sb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = drv_sb.c; sourceTree = ""; }; 146695491A2729860070D41D /* mdma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mdma.h; sourceTree = ""; }; @@ -310,7 +307,6 @@ 1466955E1A2729860070D41D /* gr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gr.c; sourceTree = ""; }; 1466955F1A2729860070D41D /* init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = init.c; sourceTree = ""; }; 146695601A2729860070D41D /* key.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = key.c; sourceTree = ""; }; - 146695611A2729860070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146695631A2729860070D41D /* mouse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mouse.c; sourceTree = ""; }; 146695651A2729860070D41D /* event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = event.h; sourceTree = ""; }; 146695661A2729860070D41D /* gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui.h; sourceTree = ""; }; @@ -339,16 +335,13 @@ 1466957F1A2729860070D41D /* joydefs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = joydefs.c; sourceTree = ""; }; 146695801A2729860070D41D /* joystick.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = joystick.c; sourceTree = ""; }; 146695811A2729860070D41D /* linuxnet.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = linuxnet.c; sourceTree = ""; }; - 146695821A2729860070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146695841A2729860070D41D /* mono.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mono.c; sourceTree = ""; }; 146695851A2729860070D41D /* serial.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = serial.c; sourceTree = ""; }; 146695861A2729860070D41D /* timer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = timer.c; sourceTree = ""; }; 146695871A2729860070D41D /* ukali.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ukali.c; sourceTree = ""; }; - 146695881A2729860070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 1466958B1A2729860070D41D /* glx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = glx.c; sourceTree = ""; }; 1466958C1A2729860070D41D /* gr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gr.c; sourceTree = ""; }; 1466958D1A2729860070D41D /* internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = internal.h; sourceTree = ""; }; - 1466958E1A2729860070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146695901A2729860070D41D /* ogl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ogl.c; sourceTree = ""; }; 146695911A2729860070D41D /* sdlgl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdlgl.c; sourceTree = ""; }; 146695921A2729860070D41D /* wgl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = wgl.c; sourceTree = ""; }; @@ -359,7 +352,6 @@ 146695981A2729860070D41D /* joy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = joy.c; sourceTree = ""; }; 146695991A2729860070D41D /* joydefs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = joydefs.c; sourceTree = ""; }; 1466959A1A2729860070D41D /* key.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = key.c; sourceTree = ""; }; - 1466959B1A2729860070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 1466959D1A2729860070D41D /* mouse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mouse.c; sourceTree = ""; }; 1466959E1A2729860070D41D /* rbaudio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rbaudio.c; sourceTree = ""; }; 1466959F1A2729860070D41D /* timer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = timer.c; sourceTree = ""; }; @@ -367,7 +359,6 @@ 146695A21A2729860070D41D /* gr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gr.c; sourceTree = ""; }; 146695A31A2729860070D41D /* init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = init.c; sourceTree = ""; }; 146695A41A2729860070D41D /* key.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = key.c; sourceTree = ""; }; - 146695A51A2729860070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146695A71A2729860070D41D /* mouse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mouse.c; sourceTree = ""; }; 146695A91A2729860070D41D /* d1x.ico */ = {isa = PBXFileReference; lastKnownFileType = image.ico; path = d1x.ico; sourceTree = ""; }; 146695AA1A2729860070D41D /* d1x.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = d1x.rc; sourceTree = ""; }; @@ -418,7 +409,6 @@ 146695DA1A2729860070D41D /* joydefs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = joydefs.c; sourceTree = ""; }; 146695DB1A2729860070D41D /* joyhh.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = joyhh.c; sourceTree = ""; }; 146695DC1A2729860070D41D /* key.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = key.c; sourceTree = ""; }; - 146695DD1A2729860070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146695DF1A2729860070D41D /* midi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = midi.c; sourceTree = ""; }; 146695E01A2729860070D41D /* mingw_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mingw_init.c; sourceTree = ""; }; 146695E11A2729860070D41D /* mono.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mono.c; sourceTree = ""; }; @@ -433,14 +423,12 @@ 146695EA1A2729860070D41D /* winmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winmain.cpp; sourceTree = ""; }; 146695EB1A2729860070D41D /* winnet.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = winnet.c; sourceTree = ""; }; 146695ED1A2729860070D41D /* CON_console.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = CON_console.c; sourceTree = ""; }; - 146695EE1A2729860070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 1466960C1A2729860070D41D /* iff15bpp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iff15bpp.c; sourceTree = ""; }; 1466960D1A2729860070D41D /* iff8bpp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iff8bpp.c; sourceTree = ""; }; 1466960E1A2729860070D41D /* iffmike.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iffmike.c; sourceTree = ""; }; 1466960F1A2729860070D41D /* ifftest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ifftest.c; sourceTree = ""; }; 146696101A2729860070D41D /* ifftestv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ifftestv.c; sourceTree = ""; }; 146696111A2729860070D41D /* iff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iff.c; sourceTree = ""; }; - 146696121A2729860070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146696151A2729860070D41D /* 3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 3d.h; sourceTree = ""; }; 146696161A2729860070D41D /* args.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = args.h; sourceTree = ""; }; 146696171A2729860070D41D /* byteswap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = byteswap.h; sourceTree = ""; }; @@ -494,10 +482,9 @@ 146696481A2729870070D41D /* decoder16.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decoder16.c; sourceTree = ""; }; 146696491A2729870070D41D /* decoder8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decoder8.c; sourceTree = ""; }; 1466964A1A2729870070D41D /* decoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decoders.h; sourceTree = ""; }; - 1466964B1A2729870070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 1466964D1A2729870070D41D /* mve_audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mve_audio.c; sourceTree = ""; }; 1466964E1A2729870070D41D /* mve_audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mve_audio.h; sourceTree = ""; }; - 1466964F1A2729870070D41D /* mve_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mve_main.c; sourceTree = ""; }; + 1466964F1A2729870070D41D /* mveplayer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mveplayer.c; sourceTree = ""; }; 146696501A2729870070D41D /* mvelib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mvelib.c; sourceTree = ""; }; 146696511A2729870070D41D /* mvelib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mvelib.h; sourceTree = ""; }; 146696521A2729870070D41D /* mveplay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mveplay.c; sourceTree = ""; }; @@ -566,7 +553,6 @@ 146696931A2729870070D41D /* kview.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kview.c; sourceTree = ""; }; 146696941A2729870070D41D /* macro.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = macro.c; sourceTree = ""; }; 146696951A2729870070D41D /* macro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macro.h; sourceTree = ""; }; - 146696961A2729870070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146696981A2729870070D41D /* med.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = med.c; sourceTree = ""; }; 146696991A2729870070D41D /* meddraw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = meddraw.c; sourceTree = ""; }; 1466969A1A2729870070D41D /* meddraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = meddraw.h; sourceTree = ""; }; @@ -639,7 +625,6 @@ 146696DD1A2729870070D41D /* lighting.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lighting.c; sourceTree = ""; }; 146696DE1A2729870070D41D /* lighting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lighting.h; sourceTree = ""; }; 146696DF1A2729870070D41D /* link.bat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = link.bat; sourceTree = ""; }; - 146696E01A2729870070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146696E21A2729870070D41D /* menu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = menu.c; sourceTree = ""; }; 146696E31A2729870070D41D /* menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = menu.h; sourceTree = ""; }; 146696E41A2729870070D41D /* mglobal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mglobal.c; sourceTree = ""; }; @@ -736,12 +721,10 @@ 146697401A2729870070D41D /* weapon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = weapon.h; sourceTree = ""; }; 146697421A2729870070D41D /* fix.asm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm.asm; path = fix.asm; sourceTree = ""; }; 146697431A2729870070D41D /* fixc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fixc.c; sourceTree = ""; }; - 146697441A2729870070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146697461A2729870070D41D /* rand.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rand.c; sourceTree = ""; }; 146697471A2729870070D41D /* tables.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tables.c; sourceTree = ""; }; 146697481A2729870070D41D /* vecmat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vecmat.c; sourceTree = ""; }; 146697491A2729870070D41D /* vecmata.asm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm.asm; path = vecmata.asm; sourceTree = ""; }; - 1466974B1A2729870070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 1466974D1A2729870070D41D /* mem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mem.c; sourceTree = ""; }; 1466974F1A2729870070D41D /* args.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = args.c; sourceTree = ""; }; 146697501A2729870070D41D /* byteswap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = byteswap.c; sourceTree = ""; }; @@ -750,7 +733,6 @@ 146697531A2729870070D41D /* errtest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = errtest.c; sourceTree = ""; }; 146697541A2729870070D41D /* hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hash.c; sourceTree = ""; }; 146697551A2729870070D41D /* ignorecase.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ignorecase.c; sourceTree = ""; }; - 146697561A2729870070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146697581A2729870070D41D /* parsarg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parsarg.c; sourceTree = ""; }; 146697591A2729870070D41D /* parsarg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parsarg.h; sourceTree = ""; }; 1466975A1A2729870070D41D /* parstest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parstest.c; sourceTree = ""; }; @@ -758,7 +740,6 @@ 1466975C1A2729870070D41D /* pngfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pngfile.c; sourceTree = ""; }; 1466975D1A2729870070D41D /* strio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strio.c; sourceTree = ""; }; 1466975E1A2729870070D41D /* strutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strutil.c; sourceTree = ""; }; - 146697601A2729870070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146697621A2729870070D41D /* ntmap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ntmap.c; sourceTree = ""; }; 146697631A2729870070D41D /* scanline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scanline.c; sourceTree = ""; }; 146697641A2729870070D41D /* scanline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scanline.h; sourceTree = ""; }; @@ -785,7 +766,6 @@ 146699221A2729C60070D41D /* keypress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keypress.c; sourceTree = ""; }; 146699231A2729C60070D41D /* keytrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keytrap.c; sourceTree = ""; }; 146699241A2729C60070D41D /* listbox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = listbox.c; sourceTree = ""; }; - 146699261A2729C60070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146699281A2729C60070D41D /* medfunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = medfunc.c; sourceTree = ""; }; 146699291A2729C60070D41D /* menu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = menu.c; sourceTree = ""; }; 1466992A1A2729C60070D41D /* menubar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = menubar.c; sourceTree = ""; }; @@ -904,7 +884,6 @@ 146699A21A2729C60070D41D /* hogcreate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hogcreate.c; sourceTree = ""; }; 146699A31A2729C60070D41D /* hogextract.1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.man; path = hogextract.1; sourceTree = ""; }; 146699A41A2729C60070D41D /* hogextract.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hogextract.c; sourceTree = ""; }; - 146699A51A2729C60070D41D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 146699A71A2729C60070D41D /* mvlcreate.1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.man; path = mvlcreate.1; sourceTree = ""; }; 146699A81A2729C60070D41D /* mvlcreate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mvlcreate.c; sourceTree = ""; }; 146699A91A2729C60070D41D /* mvlextract.1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.man; path = mvlextract.1; sourceTree = ""; }; @@ -914,9 +893,7 @@ 146699AD1A2729C60070D41D /* txb2tex.1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.man; path = txb2tex.1; sourceTree = ""; }; 146699AE1A2729C60070D41D /* txb2tex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = txb2tex.c; sourceTree = ""; }; 14669A431A285F9B0070D41D /* configure.ac */ = {isa = PBXFileReference; lastKnownFileType = text; path = configure.ac; sourceTree = ""; }; - 14669A441A2860370070D41D /* conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conf.h; sourceTree = ""; }; 14E0A3211A2C4DDE0039A9FC /* libphysfs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libphysfs.a; path = ../../../../../usr/local/lib/libphysfs.a; sourceTree = ""; }; - 14E0A3271A2C5CF10039A9FC /* Makefile.am */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -942,7 +919,7 @@ isa = PBXGroup; children = ( 14E0A3211A2C4DDE0039A9FC /* libphysfs.a */, - 146694A71A27246A0070D41D /* d2x */, + 146694A71A27246A0070D41D /* xcd2x */, 146694C31A27246A0070D41D /* d2xTests */, 146694A61A27246A0070D41D /* Products */, 146694D01A2729860070D41D /* 2d */, @@ -962,7 +939,6 @@ 146699A01A2729C60070D41D /* utilities */, 141FE1001A2D36A600A4FB18 /* Makefile.am */, 14669A431A285F9B0070D41D /* configure.ac */, - 14669A441A2860370070D41D /* conf.h */, ); sourceTree = ""; }; @@ -975,7 +951,7 @@ name = Products; sourceTree = ""; }; - 146694A71A27246A0070D41D /* d2x */ = { + 146694A71A27246A0070D41D /* xcd2x */ = { isa = PBXGroup; children = ( 146694AA1A27246A0070D41D /* AppDelegate.h */, @@ -989,7 +965,7 @@ 146694B91A27246A0070D41D /* MainMenu.xib */, 146694A81A27246A0070D41D /* Supporting Files */, ); - path = d2x; + path = xcd2x; sourceTree = ""; }; 146694A81A27246A0070D41D /* Supporting Files */ = { @@ -1035,7 +1011,6 @@ 146694DC1A2729860070D41D /* ibitblt.c */, 146694DD1A2729860070D41D /* line.c */, 146694DE1A2729860070D41D /* linear.asm */, - 146694DF1A2729860070D41D /* Makefile.am */, 146694E11A2729860070D41D /* palette.c */, 146694E21A2729860070D41D /* pcx.c */, 146694E31A2729860070D41D /* pixel.c */, @@ -1063,7 +1038,6 @@ 146694F31A2729860070D41D /* instance.c */, 146694F41A2729860070D41D /* interp.asm */, 146694F51A2729860070D41D /* interp.c */, - 146694F61A2729860070D41D /* Makefile.am */, 146694F81A2729860070D41D /* matrix.c */, 146694F91A2729860070D41D /* points.c */, 146694FA1A2729860070D41D /* rod.c */, @@ -1081,7 +1055,6 @@ 1466955C1A2729860070D41D /* ggi */, 146695641A2729860070D41D /* include */, 1466956A1A2729860070D41D /* linux */, - 146695881A2729860070D41D /* Makefile.am */, 1466958A1A2729860070D41D /* ogl */, 146695931A2729860070D41D /* sdl */, 146695A01A2729860070D41D /* svgalib */, @@ -1132,7 +1105,6 @@ 146695401A2729860070D41D /* joyc.c */, 146695411A2729860070D41D /* joydefs.c */, 146695421A2729860070D41D /* key.c */, - 146695431A2729860070D41D /* Makefile.am */, 146695451A2729860070D41D /* midiallg.c */, 146695461A2729860070D41D /* mm_snd */, 146695521A2729860070D41D /* modex.asm */, @@ -1270,7 +1242,6 @@ 1466955E1A2729860070D41D /* gr.c */, 1466955F1A2729860070D41D /* init.c */, 146695601A2729860070D41D /* key.c */, - 146695611A2729860070D41D /* Makefile.am */, 146695631A2729860070D41D /* mouse.c */, ); path = ggi; @@ -1303,7 +1274,6 @@ 1466957F1A2729860070D41D /* joydefs.c */, 146695801A2729860070D41D /* joystick.c */, 146695811A2729860070D41D /* linuxnet.c */, - 146695821A2729860070D41D /* Makefile.am */, 146695841A2729860070D41D /* mono.c */, 146695851A2729860070D41D /* serial.c */, 146695861A2729860070D41D /* timer.c */, @@ -1336,7 +1306,6 @@ 1466958B1A2729860070D41D /* glx.c */, 1466958C1A2729860070D41D /* gr.c */, 1466958D1A2729860070D41D /* internal.h */, - 1466958E1A2729860070D41D /* Makefile.am */, 146695901A2729860070D41D /* ogl.c */, 146695911A2729860070D41D /* sdlgl.c */, 146695921A2729860070D41D /* wgl.c */, @@ -1354,7 +1323,6 @@ 146695981A2729860070D41D /* joy.c */, 146695991A2729860070D41D /* joydefs.c */, 1466959A1A2729860070D41D /* key.c */, - 1466959B1A2729860070D41D /* Makefile.am */, 1466959D1A2729860070D41D /* mouse.c */, 1466959E1A2729860070D41D /* rbaudio.c */, 1466959F1A2729860070D41D /* timer.c */, @@ -1369,7 +1337,6 @@ 146695A21A2729860070D41D /* gr.c */, 146695A31A2729860070D41D /* init.c */, 146695A41A2729860070D41D /* key.c */, - 146695A51A2729860070D41D /* Makefile.am */, 146695A71A2729860070D41D /* mouse.c */, ); path = svgalib; @@ -1397,7 +1364,6 @@ 146695DA1A2729860070D41D /* joydefs.c */, 146695DB1A2729860070D41D /* joyhh.c */, 146695DC1A2729860070D41D /* key.c */, - 146695DD1A2729860070D41D /* Makefile.am */, 146695DF1A2729860070D41D /* midi.c */, 146695E01A2729860070D41D /* mingw_init.c */, 146695E11A2729860070D41D /* mono.c */, @@ -1465,7 +1431,6 @@ isa = PBXGroup; children = ( 146695ED1A2729860070D41D /* CON_console.c */, - 146695EE1A2729860070D41D /* Makefile.am */, ); path = console; sourceTree = ""; @@ -1475,7 +1440,6 @@ children = ( 1466960B1A2729860070D41D /* archive */, 146696111A2729860070D41D /* iff.c */, - 146696121A2729860070D41D /* Makefile.am */, ); path = iff; sourceTree = ""; @@ -1555,14 +1519,11 @@ 146696481A2729870070D41D /* decoder16.c */, 146696491A2729870070D41D /* decoder8.c */, 1466964A1A2729870070D41D /* decoders.h */, - 1466964B1A2729870070D41D /* Makefile.am */, 1466964D1A2729870070D41D /* mve_audio.c */, 1466964E1A2729870070D41D /* mve_audio.h */, - 1466964F1A2729870070D41D /* mve_main.c */, 146696501A2729870070D41D /* mvelib.c */, 146696511A2729870070D41D /* mvelib.h */, 146696521A2729870070D41D /* mveplay.c */, - 146696531A2729870070D41D /* mveplayer.1 */, ); path = libmve; sourceTree = ""; @@ -1570,7 +1531,6 @@ 146696541A2729870070D41D /* main */ = { isa = PBXGroup; children = ( - 14E0A3271A2C5CF10039A9FC /* Makefile.am */, 146696551A2729870070D41D /* ai.c */, 146696561A2729870070D41D /* ai.h */, 146696571A2729870070D41D /* ai2.c */, @@ -1653,7 +1613,6 @@ 146696DD1A2729870070D41D /* lighting.c */, 146696DE1A2729870070D41D /* lighting.h */, 146696DF1A2729870070D41D /* link.bat */, - 146696E01A2729870070D41D /* Makefile.am */, 146696E21A2729870070D41D /* menu.c */, 146696E31A2729870070D41D /* menu.h */, 146696E41A2729870070D41D /* mglobal.c */, @@ -1770,7 +1729,6 @@ 146696931A2729870070D41D /* kview.c */, 146696941A2729870070D41D /* macro.c */, 146696951A2729870070D41D /* macro.h */, - 146696961A2729870070D41D /* Makefile.am */, 146696981A2729870070D41D /* med.c */, 146696991A2729870070D41D /* meddraw.c */, 1466969A1A2729870070D41D /* meddraw.h */, @@ -1828,7 +1786,6 @@ children = ( 146697421A2729870070D41D /* fix.asm */, 146697431A2729870070D41D /* fixc.c */, - 146697441A2729870070D41D /* Makefile.am */, 146697461A2729870070D41D /* rand.c */, 146697471A2729870070D41D /* tables.c */, 146697481A2729870070D41D /* vecmat.c */, @@ -1840,7 +1797,6 @@ 1466974A1A2729870070D41D /* mem */ = { isa = PBXGroup; children = ( - 1466974B1A2729870070D41D /* Makefile.am */, 1466974D1A2729870070D41D /* mem.c */, ); path = mem; @@ -1856,7 +1812,6 @@ 146697531A2729870070D41D /* errtest.c */, 146697541A2729870070D41D /* hash.c */, 146697551A2729870070D41D /* ignorecase.c */, - 146697561A2729870070D41D /* Makefile.am */, 146697581A2729870070D41D /* parsarg.c */, 146697591A2729870070D41D /* parsarg.h */, 1466975A1A2729870070D41D /* parstest.c */, @@ -1871,7 +1826,6 @@ 1466975F1A2729870070D41D /* texmap */ = { isa = PBXGroup; children = ( - 146697601A2729870070D41D /* Makefile.am */, 146697621A2729870070D41D /* ntmap.c */, 146697631A2729870070D41D /* scanline.c */, 146697641A2729870070D41D /* scanline.h */, @@ -1905,7 +1859,6 @@ 146699221A2729C60070D41D /* keypress.c */, 146699231A2729C60070D41D /* keytrap.c */, 146699241A2729C60070D41D /* listbox.c */, - 146699261A2729C60070D41D /* Makefile.am */, 146699281A2729C60070D41D /* medfunc.c */, 146699291A2729C60070D41D /* menu.c */, 1466992A1A2729C60070D41D /* menubar.c */, @@ -2067,17 +2020,18 @@ isa = PBXGroup; children = ( 146699A11A2729C60070D41D /* hogcreate.1 */, - 146699A21A2729C60070D41D /* hogcreate.c */, 146699A31A2729C60070D41D /* hogextract.1 */, - 146699A41A2729C60070D41D /* hogextract.c */, - 146699A51A2729C60070D41D /* Makefile.am */, + 146696531A2729870070D41D /* mveplayer.1 */, 146699A71A2729C60070D41D /* mvlcreate.1 */, - 146699A81A2729C60070D41D /* mvlcreate.c */, 146699A91A2729C60070D41D /* mvlextract.1 */, - 146699AA1A2729C60070D41D /* mvlextract.c */, 146699AB1A2729C60070D41D /* tex2txb.1 */, - 146699AC1A2729C60070D41D /* tex2txb.c */, 146699AD1A2729C60070D41D /* txb2tex.1 */, + 146699A21A2729C60070D41D /* hogcreate.c */, + 146699A41A2729C60070D41D /* hogextract.c */, + 1466964F1A2729870070D41D /* mveplayer.c */, + 146699A81A2729C60070D41D /* mvlcreate.c */, + 146699AA1A2729C60070D41D /* mvlextract.c */, + 146699AC1A2729C60070D41D /* tex2txb.c */, 146699AE1A2729C60070D41D /* txb2tex.c */, ); path = utilities; @@ -2086,17 +2040,31 @@ /* End PBXGroup section */ /* Begin PBXLegacyTarget section */ - 14669A3F1A285C280070D41D /* d2x ext */ = { + 14669A3F1A285C280070D41D /* d2x-soft */ = { + isa = PBXLegacyTarget; + buildArgumentsString = ""; + buildConfigurationList = 14669A421A285C280070D41D /* Build configuration list for PBXLegacyTarget "d2x-soft" */; + buildPhases = ( + ); + buildToolPath = /usr/bin/make; + buildWorkingDirectory = "build/d2x-soft"; + dependencies = ( + ); + name = "d2x-soft"; + passBuildSettingsInEnvironment = 0; + productName = "d2x ext"; + }; + 14E97DFF1A3550680027FB84 /* d2x-opengl */ = { isa = PBXLegacyTarget; buildArgumentsString = ""; - buildConfigurationList = 14669A421A285C280070D41D /* Build configuration list for PBXLegacyTarget "d2x ext" */; + buildConfigurationList = 14E97E001A3550680027FB84 /* Build configuration list for PBXLegacyTarget "d2x-opengl" */; buildPhases = ( ); buildToolPath = /usr/bin/make; - buildWorkingDirectory = ""; + buildWorkingDirectory = "build/d2x-opengl"; dependencies = ( ); - name = "d2x ext"; + name = "d2x-opengl"; passBuildSettingsInEnvironment = 0; productName = "d2x ext"; }; @@ -2174,7 +2142,8 @@ targets = ( 146694A41A27246A0070D41D /* d2x */, 146694BF1A27246A0070D41D /* d2xTests */, - 14669A3F1A285C280070D41D /* d2x ext */, + 14669A3F1A285C280070D41D /* d2x-soft */, + 14E97DFF1A3550680027FB84 /* d2x-opengl */, ); }; /* End PBXProject section */ @@ -2405,14 +2374,7 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - NO_ASM, - HAVE_STRUCT_TIMEVAL, - HAVE_STRUCT_TIMESPEC, - NEWDEMO, - PIGGY_USE_PAGING, - ); + GCC_PREPROCESSOR_DEFINITIONS = ""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -2562,10 +2524,7 @@ DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2581,6 +2540,28 @@ }; name = Release; }; + 14E97E011A3550680027FB84 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEBUGGING_SYMBOLS = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "d2x-opengl"; + }; + name = Debug; + }; + 14E97E021A3550680027FB84 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "d2x-opengl"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -2611,7 +2592,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 14669A421A285C280070D41D /* Build configuration list for PBXLegacyTarget "d2x ext" */ = { + 14669A421A285C280070D41D /* Build configuration list for PBXLegacyTarget "d2x-soft" */ = { isa = XCConfigurationList; buildConfigurations = ( 14669A401A285C280070D41D /* Debug */, @@ -2620,6 +2601,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 14E97E001A3550680027FB84 /* Build configuration list for PBXLegacyTarget "d2x-opengl" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 14E97E011A3550680027FB84 /* Debug */, + 14E97E021A3550680027FB84 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 1466949D1A27246A0070D41D /* Project object */; diff --git a/iff/Makefile.am b/iff/Makefile.am deleted file mode 100644 index 4114f847..00000000 --- a/iff/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -EXTRA_SUBDIRS = archive - -noinst_LIBRARIES = libiff.a -AM_CPPFLAGS = -I $(top_srcdir)/include - -libiff_a_SOURCES = iff.c - -EXTRA_DIST = ${EXTRA_SUBDIRS} diff --git a/libmve/Makefile.am b/libmve/Makefile.am deleted file mode 100644 index 7876a0cf..00000000 --- a/libmve/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -EXTRA_PROGRAMS = mveplayer - -mveplayer_SOURCES = decoder16.c decoder8.c mve_audio.c mve_main.c mvelib.c mveplay.c - -mveplayer_MANS = mveplayer.1 - - -noinst_LIBRARIES = libmve.a - -AM_CPPFLAGS = -I$(top_srcdir)/include - -libmve_a_SOURCES = decoder16.c decoder8.c mve_audio.c mvelib.c mveplay.c - -EXTRA_DIST = decoders.h mve_audio.h mvelib.h $(mveplayer_MANS) diff --git a/main/Makefile.am b/main/Makefile.am deleted file mode 100644 index 75e3399d..00000000 --- a/main/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -SUBDIRS = @D2X_MAIN_SUBDIRS@ - -DIST_SUBDIRS = editor - -EXTRA_SUBDIRS = old - -noinst_LIBRARIES = libmain.a - -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/arch/include - -if USE_NETWORK -NETWORK_SRCS = kmatrix.c multi.c multibot.c network.c netmisc.c -endif - -if EDITOR -EDITOR_SRCS = bmread.c dumpmine.c -endif - -libmain_a_SOURCES = ${EDITOR_SRCS} ${NETWORK_SRCS} \ -ai.c ai2.c aipath.c automap.c bm.c \ -cmd.c cntrlcen.c collide.c config.c console.c \ -controls.c credits.c crypt.c digiobj.c effects.c endlevel.c \ -escort.c fireball.c fuelcen.c fvi.c game.c \ -gamecntl.c gamefont.c gamemine.c gamepal.c gamerend.c \ -gamesave.c gameseg.c gameseq.c gauges.c hostage.c \ -hud.c inferno.c kconfig.c kludge.c laser.c \ -lighting.c menu.c mglobal.c mission.c morph.c \ -movie.c \ -newdemo.c newmenu.c object.c paging.c physics.c \ -piggy.c player.c playsave.c polyobj.c powerup.c \ -render.c robot.c scores.c segment.c slew.c \ -songs.c state.c switch.c terrain.c texmerge.c \ -text.c titles.c vclip.c wall.c weapon.c - -EXTRA_libmain_a_SOURCES = \ -kmatrix.c multi.c multibot.c network.c netmisc.c \ -bmread.c dumpmine.c - -EXTRA_DIST = ${EXTRA_SUBDIRS} \ -descent.cfg inferno.ini \ -link.bat \ -ai.h aistruct.h automap.h bm.h bmread.h cntrlcen.h collide.h \ -config.h controls.h credits.h desc_id.h desw.h digi.h effects.h \ -endlevel.h escort.h \ -fireball.h fuelcen.h fvi.h fvi_a.h game.h gamefont.h gamemine.h \ -gamepal.h gamesave.h gameseg.h gameseq.h gamestat.h gauges.h \ -hostage.h hudmsg.h inferno.h joydefs.h kconfig.h \ -kmatrix.h laser.h lighting.h menu.h mission.h modem.h morph.h movie.h multi.h \ -multibot.h netmisc.h network.h newdemo.h newmenu.h \ -object.h paging.h physics.h piggy.h player.h playsave.h polyobj.h powerup.h \ -render.h reorder.h robot.h scores.h screens.h segment.h segpoint.h slew.h \ -songs.h sounds.h state.h switch.h terrain.h texmerge.h text.h textures.h \ -titles.h vclip.h vers_id.h wall.h weapon.h \ -joydefs.c diff --git a/main/editor/Makefile.am b/main/editor/Makefile.am deleted file mode 100644 index 23f7564b..00000000 --- a/main/editor/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -noinst_LIBRARIES = libeditor.a -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/arch/include -I$(top_srcdir)/main - -libeditor_a_SOURCES = \ -autosave.c centers.c curves.c eglobal.c ehostage.c \ -elight.c eobject.c eswitch.c fixseg.c func.c \ -group.c info.c kbuild.c kcurve.c kfuncs.c \ -kgame.c kgroup.c khelp.c kmine.c ksegmove.c \ -ksegsel.c ksegsize.c ktmap.c kview.c macro.c \ -med.c meddraw.c medmisc.c medrobot.c medsel.c \ -medwall.c mine.c objpage.c segment.c seguvs.c \ -texpage.c texture.c - -EXTRA_DIST = \ -centers.h editor.h ehostage.h eobject.h eswitch.h \ -info.h kdefs.h kfuncs.h macro.h meddraw.h \ -medlisp.h medmisc.h medrobot.h medsel.h medwall.h \ -objpage.h seguvs.h texpage.h diff --git a/maths/Makefile.am b/maths/Makefile.am deleted file mode 100644 index f92629f5..00000000 --- a/maths/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -noinst_LIBRARIES = libmaths.a -AM_CPPFLAGS = -I $(top_srcdir)/include - -if USE_ASM -libmaths_a_SOURCES = vecmat.c rand.c tables.c -else -libmaths_a_SOURCES = vecmat.c rand.c tables.c fixc.c -endif - -SUFFIXES = .asm -.asm.o: - $(NASM) $(NASMFLAGS) $< -o $@ - -if USE_ASM -libmaths_a_LIBADD = vecmata.o fix.o -endif - -EXTRA_DIST = \ -fix.asm vecmata.asm \ -fixc.c rand.c tables.c vecmat.c diff --git a/mem/Makefile.am b/mem/Makefile.am deleted file mode 100644 index fc4d1d77..00000000 --- a/mem/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -noinst_LIBRARIES = libmem.a -AM_CPPFLAGS = -I $(top_srcdir)/include - -libmem_a_SOURCES = mem.c diff --git a/misc/Makefile.am b/misc/Makefile.am deleted file mode 100644 index dd0e18f2..00000000 --- a/misc/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -noinst_LIBRARIES = libmisc.a -AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir)/main - -if USE_LIBPNG -PNG_SRCS = pngfile.c -endif - -libmisc_a_SOURCES = ${PNG_SRCS} \ -args.c error.c strio.c ignorecase.c physfsrwops.c \ -hash.c strutil.c - -EXTRA_libmisc_a_SOURCES = pngfile.c - -# checker.c - -#checker.o: checker.c -# gcc -c -g $< -o $@ $(INCLUDES) $(CFLAGS) -I/usr/lib/checker/i686-pc-linux-gnu/include -I.. -I. - -EXTRA_DIST = \ -dos_disk.h parsarg.h \ -byteswap.c errtest.c parsarg.c parstest.c diff --git a/texmap/Makefile.am b/texmap/Makefile.am deleted file mode 100644 index 8f95048a..00000000 --- a/texmap/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -noinst_LIBRARIES = libtexmap.a -AM_CPPFLAGS = -I $(top_srcdir)/include -DFL1_WITH_FLAT - -if !USE_OPENGL -NOGL_SRCS = tmapflat.c -if USE_ASM -ASM_SRCS = tmappent.S tmapppro.S # more hacked in with LIBADD below -endif -endif - -libtexmap_a_SOURCES = ${NOGL_SRCS} ${ASM_SRCS} \ -ntmap.c scanline.c - -SUFFIXES = .asm -.asm.o: - $(NASM) $(NASMFLAGS) $< -o $@ - -if !USE_OPENGL -if USE_ASM -libtexmap_a_LIBADD = tmap_flt.o tmap_lin.o tmap_ll.o tmap_per.o tmapfade.o -endif -endif - -EXTRA_libtexmap_a_SOURCES = tmapflat.c tmappent.S tmapppro.S - -EXTRA_DIST = \ -tmap_flt.asm tmap_inc.asm tmap_lin.asm tmap_ll.asm tmap_per.asm tmapfade.asm \ -tmappent.S tmapppro.S \ -scanline.h texmapl.h \ -scanline.c diff --git a/ui/Makefile.am b/ui/Makefile.am deleted file mode 100644 index 7f594254..00000000 --- a/ui/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -noinst_LIBRARIES = libui.a -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/arch/include -libui_a_SOURCES = \ -barbox.c button.c checkbox.c file.c gadget.c \ -icon.c inputbox.c keypad.c keypress.c keytrap.c \ -listbox.c menu.c menubar.c message.c mouse.c \ -number.c popup.c radio.c scroll.c ui.c \ -uidraw.c userbox.c window.c - -EXTRA_DIST = \ -func.c func.h harderr.c medfunc.c diff --git a/utilities/Makefile.am b/utilities/Makefile.am deleted file mode 100644 index 6950e54b..00000000 --- a/utilities/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -EXTRA_PROGRAMS = hogcreate hogextract mvlcreate mvlextract txb2tex tex2txb - -hogcreate_SOURCES = hogcreate.c -hogcreate_MANS = hogcreate.1 - -hogextract_SOURCES = hogextract.c -hogextract_MANS = hogextract.1 - -mvlcreate_SOURCES = mvlcreate.c -mvlcreate_MANS = mvlcreate.1 - -mvlextract_SOURCES = mvlextract.c -mvlextract_MANS = mvlextract.1 - -txb2tex_SOURCES = txb2tex.c -txb2tex_MANS = txb2tex.1 - -tex2txb_SOURCES = tex2txb.c -tex2txb_MANS = tex2txb.1 - -utils: $(EXTRA_PROGRAMS) - -EXTRA_DIST = \ - $(hogcreate_MANS) $(hogextract_MANS) \ - $(mvlcreate_MANS) $(mvlextract_MANS) \ - $(txb2tex_MANS) $(tex2txb_MANS) - -.PHONY: utils diff --git a/utilities/tex2txb.c b/utilities/tex2txb.c old mode 100755 new mode 100644 diff --git a/utilities/txb2tex.c b/utilities/txb2tex.c old mode 100755 new mode 100644 -- 2.39.2