diff --git a/.gitignore b/.gitignore index 3f87d047c..e34065118 100644 --- a/.gitignore +++ b/.gitignore @@ -1,39 +1,55 @@ -/polymer/eduke32/eduke32 -/polymer/eduke32/mapster32 -/polymer/eduke32/voidsw -/polymer/eduke32/voidsw-editor -/polymer/eduke32/kenbuild -/polymer/eduke32/kenbuild-editor -/polymer/eduke32/apps -/polymer/eduke32/*.exe -/polymer/eduke32/*.dll -/polymer/eduke32/*.dylib -/polymer/eduke32/*.so -/polymer/eduke32/*.con -/polymer/eduke32/*.sym -/polymer/eduke32/*.memmap -/polymer/eduke32/*.manifest -/polymer/eduke32/*.log -/polymer/eduke32/*.map -/polymer/eduke32/*.pdb -/polymer/eduke32/*.sdf -/polymer/eduke32/*.suo -/polymer/eduke32/*.opensdf -/polymer/eduke32/.vs -/polymer/eduke32/*.vcxproj.user -/polymer/eduke32/*.psess -/polymer/eduke32/*.vsp -/polymer/eduke32/*.elf -/polymer/eduke32/*.dol -/polymer/eduke32/*.x86 -/polymer/eduke32/*.x64 -/polymer/eduke32/*.ppc -/polymer/eduke32/*.app -/polymer/eduke32/rsrc/game_banner.c -/polymer/eduke32/rsrc/editor_banner.c -/polymer/eduke32/obj -xcuserdata -project.xcworkspace -.DS_Store -/polymer/eduke32/*.cache -/polymer/eduke32/*.cfg + +./obj/ + +./eduke32 +./mapster32 +./voidsw +./voidsw-editor +./kenbuild +./kenbuild-editor +./apps/ +./*.exe +./*.dll +./*.dylib +./*.so +./*.elf +./*.dol +./*.x86 +./*.x64 +./*.ppc +./*.app + +./*.log +./*.cache +./*.cfg +./textures + +./platform/Windows/*.exe +./platform/Windows/*.log +./platform/Windows/*.cache +./platform/Windows/*.cfg +./platform/Windows/textures + +./platform/Windows/*.cache +./platform/Windows/*.cfg +./platform/Windows/.vs/ +./platform/Windows/*.db +./platform/Windows/*.opendb +./platform/Windows/*.con +./platform/Windows/*.sym +./platform/Windows/*.memmap +./platform/Windows/*.manifest +./platform/Windows/*.map +./platform/Windows/*.pdb +./platform/Windows/*.sdf +./platform/Windows/*.suo +./platform/Windows/*.opensdf +./platform/Windows/*.vcxproj.user +./platform/Windows/*.psess +./platform/Windows/*.vsp + +xcuserdata/ +project.xcworkspace/ +*.dSYM/ + +.DS_Store diff --git a/Android.mk b/Android.mk index 9e930e112..577a7ed87 100644 --- a/Android.mk +++ b/Android.mk @@ -36,112 +36,111 @@ endif LOCAL_CFLAGS = $(COMMONFLAGS) LOCAL_CPPFLAGS = $(COMMONFLAGS) -LOCAL_C_INCLUDES := $(LOCAL_PATH)/source $(LOCAL_PATH)/source/jmact $(LOCAL_PATH)/source/jaudiolib/include $(LOCAL_PATH)/source/enet/include $(LOCAL_PATH)/build/include -LOCAL_C_INCLUDES += $(LOCAL_PATH)/source/android/etcpak +LOCAL_C_INCLUDES := $(LOCAL_PATH)/source/duke3d/src $(LOCAL_PATH)/source/mact/include $(LOCAL_PATH)/source/audiolib/include $(LOCAL_PATH)/source/enet/include $(LOCAL_PATH)/source/build/include +LOCAL_C_INCLUDES += $(LOCAL_PATH)/source/etcpak/include LOCAL_C_INCLUDES += $(TOP_DIR)/ $(TOP_DIR)/Libraries/liboggvorbis/include $(TOP_DIR)/Libraries/ $(TOP_DIR)/Libraries/SDL2/include $(TOP_DIR)/Libraries/SDL2_mixer/include $(TOP_DIR)/Libraries/TinyXML/include $(TOP_DIR)/TouchControls $(TOP_DIR)/Libraries/libvpx/include ANDROID_SRC = \ - build/src/jwzgles.c \ + source/build/src/jwzgles.c \ platform/Android/Duke3d/jni/android-jni.cpp \ - source/android/etcpak/ProcessRGB.cpp \ - source/android/etcpak/Tables.cpp \ - source/android/in_android.c + source/etcpak/src/ProcessRGB.cpp \ + source/etcpak/src/Tables.cpp \ + source/duke3d/src/in_android.cpp \ BUILD_SRC = \ - build/src/2d.c \ - build/src/a-c.c \ - build/src/baselayer.c \ - build/src/cache1d.c \ - build/src/compat.c \ - build/src/common.c \ - build/src/crc32.c \ - build/src/defs.c \ - build/src/clip.c \ - build/src/colmatch.c \ - build/src/engine.c \ - build/src/hash.c \ - build/src/glbuild.c \ - build/src/polymost.c \ - build/src/mdsprite.c \ - build/src/texcache.c \ - build/src/dxtfilter.c \ - build/src/hightile.c \ - build/src/textfont.c \ - build/src/smalltextfont.c \ - build/src/kplib.c \ - build/src/mmulti_null.c \ - build/src/lz4.c \ - build/src/osd.c \ - build/src/md4.c \ - build/src/pragmas.c \ - build/src/scriptfile.c \ - build/src/mutex.c \ - build/src/xxhash.c \ - build/src/voxmodel.c \ - build/src/sdlayer.c \ - build/src/screenshot.c \ - build/src/tiles.c \ - build/src/mhk.c \ - build/src/palette.c + source/build/src/2d.cpp \ + source/build/src/a-c.cpp \ + source/build/src/animvpx.cpp \ + source/build/src/baselayer.cpp \ + source/build/src/cache1d.cpp \ + source/build/src/compat.cpp \ + source/build/src/common.cpp \ + source/build/src/crc32.cpp \ + source/build/src/defs.cpp \ + source/build/src/clip.cpp \ + source/build/src/colmatch.cpp \ + source/build/src/engine.cpp \ + source/build/src/hash.cpp \ + source/build/src/glbuild.cpp \ + source/build/src/polymost.cpp \ + source/build/src/mdsprite.cpp \ + source/build/src/texcache.cpp \ + source/build/src/dxtfilter.cpp \ + source/build/src/hightile.cpp \ + source/build/src/textfont.cpp \ + source/build/src/smalltextfont.cpp \ + source/build/src/kplib.cpp \ + source/build/src/mmulti_null.cpp \ + source/build/src/lz4.c \ + source/build/src/osd.cpp \ + source/build/src/md4.cpp \ + source/build/src/pragmas.cpp \ + source/build/src/scriptfile.cpp \ + source/build/src/mutex.cpp \ + source/build/src/xxhash.c \ + source/build/src/voxmodel.cpp \ + source/build/src/rev.cpp \ + source/build/src/sdlayer.cpp \ + source/build/src/screenshot.cpp \ + source/build/src/tiles.cpp \ + source/build/src/mhk.cpp \ + source/build/src/palette.cpp \ -JMACT_SRC = \ - source/jmact/file_lib.c \ - source/jmact/control.c \ - source/jmact/keyboard.c \ - source/jmact/mouse.c \ - source/jmact/joystick.c \ - source/jmact/scriplib.c \ - source/jmact/animlib.c +MACT_SRC = \ + source/mact/src/file_lib.cpp \ + source/mact/src/control.cpp \ + source/mact/src/keyboard.cpp \ + source/mact/src/joystick.cpp \ + source/mact/src/scriplib.cpp \ + source/mact/src/animlib.cpp \ GAME_SRC = \ - source/game.c \ - source/actors.c \ - source/anim.c \ - source/animsounds.c \ - source/animvpx.c \ - source/common.c \ - source/config.c \ - source/demo.c \ - source/gamedef.c \ - source/gameexec.c \ - source/gamevars.c \ - source/global.c \ - source/input.c \ - source/menus.c \ - source/namesdyn.c \ - source/net.c \ - source/player.c \ - source/premap.c \ - source/savegame.c \ - source/sector.c \ - source/rts.c \ - source/osdfuncs.c \ - source/osdcmds.c \ - source/grpscan.c \ - source/sounds.c \ - source/soundsdyn.c \ - source/sdlmusic.c \ - source/rev.c \ - source/cmdline.c \ - source/screens.c \ - source/screentext.c \ - source/cheats.c \ - source/sbar.c + source/duke3d/src/game.cpp \ + source/duke3d/src/actors.cpp \ + source/duke3d/src/anim.cpp \ + source/duke3d/src/animsounds.cpp \ + source/duke3d/src/common.cpp \ + source/duke3d/src/config.cpp \ + source/duke3d/src/demo.cpp \ + source/duke3d/src/gamedef.cpp \ + source/duke3d/src/gameexec.cpp \ + source/duke3d/src/gamevars.cpp \ + source/duke3d/src/global.cpp \ + source/duke3d/src/input.cpp \ + source/duke3d/src/menus.cpp \ + source/duke3d/src/namesdyn.cpp \ + source/duke3d/src/net.cpp \ + source/duke3d/src/player.cpp \ + source/duke3d/src/premap.cpp \ + source/duke3d/src/savegame.cpp \ + source/duke3d/src/sector.cpp \ + source/duke3d/src/rts.cpp \ + source/duke3d/src/osdfuncs.cpp \ + source/duke3d/src/osdcmds.cpp \ + source/duke3d/src/grpscan.cpp \ + source/duke3d/src/sounds.cpp \ + source/duke3d/src/soundsdyn.cpp \ + source/duke3d/src/sdlmusic.cpp \ + source/duke3d/src/cmdline.cpp \ + source/duke3d/src/screens.cpp \ + source/duke3d/src/screentext.cpp \ + source/duke3d/src/cheats.cpp \ + source/duke3d/src/sbar.cpp \ -JAUDIO_SRC = \ - source/jaudiolib/src/drivers.c \ - source/jaudiolib/src/fx_man.c \ - source/jaudiolib/src/multivoc.c \ - source/jaudiolib/src/mix.c \ - source/jaudiolib/src/mixst.c \ - source/jaudiolib/src/pitch.c \ - source/jaudiolib/src/formats.c \ - source/jaudiolib/src/vorbis.c \ - source/jaudiolib/src/flac.c \ - source/jaudiolib/src/xa.c \ - source/jaudiolib/src/xmp.c \ - source/jaudiolib/src/driver_nosound.c \ - source/jaudiolib/src/driver_sdl.c +AUDIOLIB_SRC = \ + source/audiolib/src/drivers.cpp \ + source/audiolib/src/fx_man.cpp \ + source/audiolib/src/multivoc.cpp \ + source/audiolib/src/mix.cpp \ + source/audiolib/src/mixst.cpp \ + source/audiolib/src/pitch.cpp \ + source/audiolib/src/formats.cpp \ + source/audiolib/src/vorbis.cpp \ + source/audiolib/src/flac.cpp \ + source/audiolib/src/xa.cpp \ + source/audiolib/src/xmp.cpp \ + source/audiolib/src/driver_nosound.cpp \ + source/audiolib/src/driver_sdl.cpp \ ENET_SRC = \ source/enet/src/callbacks.c \ @@ -151,9 +150,9 @@ ENET_SRC = \ source/enet/src/peer.c \ source/enet/src/protocol.c \ source/enet/src/compress.c \ - source/enet/src/unix.c + source/enet/src/unix.c \ -LOCAL_SRC_FILES = $(ANDROID_SRC) $(JAUDIO_SRC) $(JMACT_SRC) $(GAME_SRC) $(BUILD_SRC) +LOCAL_SRC_FILES = $(ANDROID_SRC) $(AUDIOLIB_SRC) $(MACT_SRC) $(GAME_SRC) $(BUILD_SRC) LOCAL_LDLIBS := -lGLESv1_CM -lEGL -ldl -llog LOCAL_STATIC_LIBRARIES := touch diff --git a/Common.mak b/Common.mak index 3a0c3a785..837b586c9 100644 --- a/Common.mak +++ b/Common.mak @@ -601,29 +601,19 @@ ifeq ($(PLATFORM),WINDOWS) endif ifneq ($(LUNATIC),0) - ifneq ($(CPLUSPLUS),0) - # FIXME: Lunatic C++ doesn't build because otherwise it doesn't find - # INT32_MIN and the like. - COMPILERFLAGS+= -D__STDC_LIMIT_MACROS - endif - - COMPILERFLAGS+= -Isource/lunatic -DLUNATIC + COMPILERFLAGS+= -Isource/duke3d/src/lunatic -DLUNATIC ifneq ($(USE_LUAJIT_2_1),0) COMPILERFLAGS+= -DUSE_LUAJIT_2_1 endif - # Determine size of defs.ilua bytecode once. + # Determine size of _defs*.lua bytecode once. ifndef DEFS_BC_SIZE - DEFS_BC_SIZE := $(shell $(LUAJIT) -bg -t h source/lunatic/defs.ilua -) + DEFS_BC_SIZE := $(shell $(LUAJIT) -bg -t h source/duke3d/src/lunatic/_defs_game.lua -) DEFS_BC_SIZE := $(word 3, $(DEFS_BC_SIZE)) - # Pass it to the sub-makes, too. - export DEFS_BC_SIZE endif - # Determine size of defs_m32.ilua bytecode once. ifndef DEFS_M32_BC_SIZE - DEFS_M32_BC_SIZE := $(shell $(LUAJIT) -bg -t h source/lunatic/defs_m32.ilua -) + DEFS_M32_BC_SIZE := $(shell $(LUAJIT) -bg -t h source/duke3d/src/lunatic/_defs_editor.lua -) DEFS_M32_BC_SIZE := $(word 3, $(DEFS_M32_BC_SIZE)) - export DEFS_M32_BC_SIZE endif COMPILERFLAGS+= -DLUNATIC_DEFS_BC_SIZE=$(DEFS_BC_SIZE) -DLUNATIC_DEFS_M32_BC_SIZE=$(DEFS_M32_BC_SIZE) @@ -706,17 +696,10 @@ endif # endif # endif -# NOTE: If your setup doesn't have libstdc++, you can try using libsupc++. -# Search for STDCPPLIB below and change it to -lsupc++. - ifeq ($(SUBPLATFORM),LINUX) COMPILERFLAGS+= -DHAVE_INTTYPES GTKCOMPAT32=0 - # On Linux, we don't need to specify libstdc++ manually, the linker will - # presumably take care for us. - STDCPPLIB:= - ifeq ($(PLATFORM),GCW) override USE_OPENGL=0 override NOASM=1 @@ -764,7 +747,6 @@ ifeq ($(PLATFORM),DARWIN) COMPILERFLAGS+= -I/sw/include endif - STDCPPLIB:=-lstdc++ COMPILERFLAGS += -DHAVE_INTTYPES DLLSUFFIX=.dylib GTKCOMPAT32 = 0 @@ -805,7 +787,6 @@ ifeq ($(PLATFORM),WINDOWS) GUI_LIBS += -mwindows endif #-lshfolder - STDCPPLIB:=-lstdc++ else RENDERTYPE?=SDL MIXERTYPE?=SDL @@ -814,12 +795,9 @@ ifeq ($(PLATFORM),BSD) COMPILERFLAGS+= -I/usr/local/include COMPILERFLAGS+= -DHAVE_INTTYPES - STDCPPLIB:=-lstdc++ endif ifeq ($(PLATFORM),BEOS) override NOASM=1 - - STDCPPLIB:=-lstdc++ endif ifeq ($(PLATFORM),SKYOS) EXESUFFIX=.app @@ -844,13 +822,11 @@ endif ifeq ($(PLATFORM),QNX) override USE_OPENGL=0 override NOASM=1 - STDCPPLIB:=-lstdc++ LIBS+= -lsocket endif ifeq ($(PLATFORM),SUNOS) override USE_OPENGL=0 override NOASM=1 - STDCPPLIB:=-lstdc++ LIBS+= -lsocket -lnsl endif ifeq ($(PLATFORM),SYLLABLE) @@ -872,12 +848,6 @@ ifneq ($(EXESUFFIX_OVERRIDE),) EXESUFFIX=$(EXESUFFIX_OVERRIDE) endif -ifneq (0,$(CLANG)) - ifneq (,$(STDCPPLIB)) - STDCPPLIB:=-Xlinker $(STDCPPLIB) - endif -endif - ifeq ($(RENDERTYPE),SDL) ifeq ($(SDL_TARGET),2) SDLCONFIG ?= sdl2-config @@ -1049,13 +1019,14 @@ ifneq (,$(VC_REV)$(VC_REV_CUSTOM)) REVFLAG += -DREV="\"r$(VC_REV)$(VC_REV_CUSTOM)\"" endif -COMPILER=$(CC) $(CONLYFLAGS) +COMPILER_C=$(CC) $(CONLYFLAGS) +COMPILER_CXX=$(CXX) $(CXXONLYFLAGS) COMPILER_OBJC=$(COBJC) $(CONLYFLAGS) -LINKER=$(L_CC) $(CONLYFLAGS) +COMPILER_OBJCXX=$(COBJCXX) $(CXXONLYFLAGS) +LINKER=$(L_CXX) $(CXXONLYFLAGS) $(L_CXXONLYFLAGS) ifneq ($(CPLUSPLUS),0) - COMPILER=$(CXX) $(CXXONLYFLAGS) - COMPILER_OBJC=$(COBJCXX) $(CXXONLYFLAGS) - LINKER=$(L_CXX) $(CXXONLYFLAGS) $(L_CXXONLYFLAGS) + COMPILER_C=$(COMPILER_CXX) + COMPILER_OBJC=$(COMPILER_OBJCXX) endif ifneq (,$(CUSTOMOPT)) @@ -1073,9 +1044,9 @@ endif ifeq ($(PRETTY_OUTPUT),1) RECIPE_IF = if -BUILD_SETTINGS_COMPILER = \033[1;36mcompiler: \033[0;36m\"$(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS)\" +BUILD_SETTINGS_COMPILER = \033[1;36mcompiler: \033[0;36m\"$(COMPILER_C) $(COMMONFLAGS) $(COMPILERFLAGS)\" BUILD_SETTINGS_ASSEMBLER = \033[1;36massembler: \033[0;36m\"$(AS) $(ASFLAGS)\" -BUILD_SETTINGS_LINKER = \033[1;36mlinker: \033[0;36m\"$(LINKER) $(COMMONFLAGS) $(LINKERFLAGS) $(LIBDIRS) $(LIBS) $(STDCPPLIB)\" +BUILD_SETTINGS_LINKER = \033[1;36mlinker: \033[0;36m\"$(LINKER) $(COMMONFLAGS) $(LINKERFLAGS) $(LIBDIRS) $(LIBS)\" ifeq (0,$(NOASM)) BUILD_SETTINGS = printf "$(BUILD_SETTINGS_COMPILER)\n$(BUILD_SETTINGS_ASSEMBLER)\n$(BUILD_SETTINGS_LINKER)\033[0m\n" else diff --git a/GNUmakefile b/GNUmakefile index e7c37b81a..29727566f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -2,12 +2,14 @@ # EDuke32 Makefile for GNU Make # -include Makefile.common +include Common.mak -DUKE3D_SRC=source -DUKE3D_INC=$(DUKE3D_SRC) -DUKE3D_RSRC=rsrc -ENGINE_ROOT=build +source=source +DUKE3D=duke3d +DUKE3D_ROOT=$(source)/$(DUKE3D) +DUKE3D_SRC=$(DUKE3D_ROOT)/src +DUKE3D_RSRC=$(DUKE3D_ROOT)/rsrc +ENGINE_ROOT=$(source)/$(ENGINE) ENGINE_SRC=$(ENGINE_ROOT)/src ENGINE_INC=$(ENGINE_ROOT)/include o=o @@ -36,6 +38,7 @@ ENGINE_CFLAGS=-I$(ENGINE_SRC) ENGINE_OBJ=$(obj)/$(ENGINE) ENGINE_OBJS = \ + rev \ baselayer \ cache1d \ common \ @@ -65,7 +68,7 @@ ENGINE_OBJS = \ md4 \ colmatch \ screenshot \ - mhk + mhk \ ENGINE_EDITOR_OBJS = \ build \ @@ -127,6 +130,10 @@ ifeq ($(RENDERTYPE),WIN) ENGINE_OBJS+= winlayer rawinput endif +ifneq ($(USE_LIBVPX),0) + ENGINE_OBJS+= animvpx +endif + ENGINE_OBJS_EXP:=$(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(ENGINE_OBJS))) ENGINE_EDITOR_OBJS_EXP:=$(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(ENGINE_EDITOR_OBJS))) @@ -135,9 +142,9 @@ ENGINE_EDITOR_OBJS_EXP:=$(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(ENGINE_EDIT MACT=mact -MACT_ROOT=$(DUKE3D_SRC)/jmact -MACT_SRC=$(MACT_ROOT) -MACT_INC=$(MACT_ROOT) +MACT_ROOT=$(source)/$(MACT) +MACT_SRC=$(MACT_ROOT)/src +MACT_INC=$(MACT_ROOT)/include MACT_OBJ=$(obj)/$(MACT) MACT_OBJS = \ @@ -169,13 +176,11 @@ AUDIOLIB_OBJS = \ xmp \ driver_nosound \ -AUDIOLIB_ROOT=$(DUKE3D_SRC)/jaudiolib +AUDIOLIB_ROOT=$(source)/$(AUDIOLIB) AUDIOLIB_SRC=$(AUDIOLIB_ROOT)/src AUDIOLIB_INC=$(AUDIOLIB_ROOT)/include AUDIOLIB_OBJ=$(obj)/$(AUDIOLIB) -AUDIOLIB_CFLAGS=-I$(AUDIOLIB_ROOT)/third-party/common/include - ifeq ($(PLATFORM),WINDOWS) ifeq ($(MIXERTYPE),WIN) AUDIOLIB_OBJS+= driver_directsound @@ -209,7 +214,7 @@ ENET_OBJS = \ protocol \ compress \ -ENET_ROOT=$(DUKE3D_SRC)/enet +ENET_ROOT=$(source)/$(ENET) ENET_SRC=$(ENET_ROOT)/src ENET_INC=$(ENET_ROOT)/include ENET_OBJ=$(obj)/$(ENET) @@ -234,16 +239,24 @@ endif # Tools -UTIL_OBJS = \ +TOOLS=tools + +TOOLS_OBJS = \ + compat_tools \ + +ENGINE_TOOLS_OBJS = \ compat \ pragmas \ kplib \ cache1d \ crc32 \ colmatch \ - compat_tools \ -UTILS= \ +TOOLS_ROOT=$(source)/$(TOOLS) +TOOLS_SRC=$(TOOLS_ROOT)/src +TOOLS_OBJ=$(obj)/$(TOOLS) + +TOOLS_TARGETS= \ kextract \ kgroup \ transpal \ @@ -258,30 +271,28 @@ UTILS= \ mkpalette \ unpackssi \ bsuite \ + ivfrate \ map2stl \ -GAMEUTILS= \ - ivfrate \ - -DXUTILS= \ +DXTOOLS_TARGETS= \ enumdisplay \ getdxdidf \ -SDLUTILS= \ +SDLTOOLS_TARGETS= \ makesdlkeytrans \ ifeq ($(PLATFORM),DARWIN) - UTIL_OBJS += osxbits + TOOLS_OBJS += osxbits endif -UTIL_OBJS_EXP:=$(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(UTIL_OBJS))) +TOOLS_OBJS_EXP:=$(addprefix $(TOOLS_OBJ)/,$(addsuffix .$o,$(TOOLS_OBJS))) $(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(ENGINE_TOOLS_OBJS))) # KenBuild (Test Game) KENBUILD=kenbuild -KENBUILD_ROOT=$(DUKE3D_SRC)/testgame +KENBUILD_ROOT=$(source)/$(KENBUILD) KENBUILD_SRC=$(KENBUILD_ROOT)/src KENBUILD_RSRC=$(KENBUILD_ROOT)/rsrc KENBUILD_OBJ=$(obj)/$(KENBUILD) @@ -332,7 +343,7 @@ KENBUILD_EDITOR_OBJS_EXP:=$(addprefix $(KENBUILD_OBJ)/,$(addsuffix .$o,$(KENBUIL DUKE3D=duke3d -DUKE3D_CFLAGS=-I$(DUKE3D_INC) +DUKE3D_CFLAGS=-I$(DUKE3D_SRC) DUKE3D_GAME_LDFLAGS= DUKE3D_EDITOR_LDFLAGS= @@ -348,15 +359,11 @@ DUKE3D_EDITOR ?= mapster32 DUKE3D_GAME_PROPER ?= EDuke32 DUKE3D_EDITOR_PROPER ?= Mapster32 -COMMON_GAME_OBJS = \ - rev \ - COMMON_EDITOR_OBJS = \ m32common \ m32def \ m32exec \ m32vars \ - rev \ DUKE3D_GAME_OBJS = \ game \ @@ -396,10 +403,6 @@ DUKE3D_EDITOR_OBJS = \ grpscan \ sounds_mapster32 \ -ifneq ($(USE_LIBVPX),0) - DUKE3D_GAME_OBJS+= animvpx -endif - DUKE3D_GAME_MISCDEPS= DUKE3D_EDITOR_MISCDEPS= @@ -418,12 +421,12 @@ LUNATIC_OBJS = \ luaJIT_BC_dis_x64 \ LUNATIC_GAME_OBJS = \ + luaJIT_BC__defs_game \ luaJIT_BC_con_lang \ luaJIT_BC_lunacon \ luaJIT_BC_randgen \ luaJIT_BC_stat \ luaJIT_BC_control \ - luaJIT_BC_defs \ luaJIT_BC_savegame \ luaJIT_BC_fs \ @@ -431,18 +434,18 @@ LUNATIC_GAME_OBJS = \ ifneq (0,$(LUNATIC)) # TODO: remove debugging modules from release build - DUKE3D_EDITOR_OBJS+= lunatic_m32 $(LUNATIC_OBJS) + DUKE3D_EDITOR_OBJS+= lunatic_editor $(LUNATIC_OBJS) DUKE3D_GAME_OBJS+= lunatic_game $(LUNATIC_OBJS) - DUKE3D_EDITOR_OBJS+= luaJIT_BC_defs_m32 + DUKE3D_EDITOR_OBJS+= luaJIT_BC__defs_editor ifneq ($(PLATFORM),WINDOWS) # On non-Windows, we expect to have liblpeg.a (or a symlink to it) in source/. # On Windows, it will reside in platform/Windows/lib/32/ or lib/64/. - LIBDIRS+= -L$(DUKE3D_SRC) - ifeq ($(realpath $(DUKE3D_SRC)/liblpeg.a),) + LIBDIRS+= -L$(source) + ifeq ($(realpath $(source)/liblpeg.a),) # XXX: This cripples "make clean" etc. too, but IMO it's better than warning. - $(error "liblpeg.a not found in $(realpath $(DUKE3D_OBJ)/..)") + $(error "liblpeg.a not found in $(realpath $(source))") endif endif LIBS+= -llpeg @@ -455,23 +458,23 @@ ifneq (0,$(LUNATIC)) # strip on OSX says: removing global symbols from a final linked no longer supported. # Use -exported_symbols_list at link time when building # But, following _their_ directions does not give us the symbols! wtf? - DUKE3D_GAME_STRIPFLAGS+= -s $(DUKE3D_OBJ)/lunatic_dynsymlist_osx - DUKE3D_EDITOR_STRIPFLAGS+= -s $(DUKE3D_OBJ)/lunatic_dynsymlist_m32_osx + # Instead of using -alias_list and -exported_symbols_list, prevent stripping them. + DUKE3D_GAME_STRIPFLAGS+= -s $(DUKE3D_OBJ)/lunatic_dynsymlist_game_osx + DUKE3D_EDITOR_STRIPFLAGS+= -s $(DUKE3D_OBJ)/lunatic_dynsymlist_editor_osx - DUKE3D_GAME_MISCDEPS+= $(DUKE3D_OBJ)/lunatic_dynsymlist_osx - DUKE3D_EDITOR_MISCDEPS+= $(DUKE3D_OBJ)/lunatic_dynsymlist_m32_osx + DUKE3D_GAME_MISCDEPS+= $(DUKE3D_OBJ)/lunatic_dynsymlist_game_osx + DUKE3D_EDITOR_MISCDEPS+= $(DUKE3D_OBJ)/lunatic_dynsymlist_editor_osx LINKERFLAGS+= -pagezero_size 10000 -image_base 100000000 - # DUKE3D_GAME_LDFLAGS+= #-Wl,-alias_list -Wl,$(DUKE3D_OBJ)/lunatic_aliases_list #-exported_symbols_list $(DUKE3D_OBJ)/lunatic_dynsymlist_osx endif ifeq ($(PLATFORM),WINDOWS) override STRIP= - DUKE3D_GAME_MISCDEPS+= $(DUKE3D_OBJ)/lunatic_eduke32.def - DUKE3D_EDITOR_MISCDEPS+= $(DUKE3D_OBJ)/lunatic_mapster32.def + DUKE3D_GAME_MISCDEPS+= $(DUKE3D_OBJ)/lunatic_dynsymlist_game.def + DUKE3D_EDITOR_MISCDEPS+= $(DUKE3D_OBJ)/lunatic_dynsymlist_editor.def endif ifeq ($(SUBPLATFORM),LINUX) override STRIP= - DUKE3D_GAME_LDFLAGS+= -Wl,--dynamic-list=$(DUKE3D_SRC)/lunatic/dynsymlist - DUKE3D_EDITOR_LDFLAGS+= -Wl,--dynamic-list=$(DUKE3D_SRC)/lunatic/dynsymlist_m32 + DUKE3D_GAME_LDFLAGS+= -Wl,--dynamic-list=$(DUKE3D_SRC)/lunatic/dynsymlist_game.lds + DUKE3D_EDITOR_LDFLAGS+= -Wl,--dynamic-list=$(DUKE3D_SRC)/lunatic/dynsymlist_editor.lds endif endif @@ -490,8 +493,6 @@ ifeq ($(PLATFORM),BSD) endif ifeq ($(PLATFORM),DARWIN) - # LIBDIRS += -L$(AUDIOLIB_ROOT)/third-party/Apple/lib - ifneq (0,$(HAVE_XMP)) LIBS += -lxmp-lite endif @@ -513,7 +514,6 @@ ifeq ($(PLATFORM),WINDOWS) LIBS += -lxmp-lite endif LIBS += -lFLAC -lvorbisfile -lvorbis -logg - LIBDIRS += -L$(AUDIOLIB_ROOT)/third-party/Windows/lib$(WINLIB) DUKE3D_GAME_OBJS+= gameres winbits DUKE3D_EDITOR_OBJS+= buildres ifeq ($(STARTUP_WINDOW),1) @@ -544,7 +544,6 @@ endif ## Construct file names of object files -COMMON_OBJS_EXP:=$(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(COMMON_GAME_OBJS))) COMMON_EDITOR_OBJS_EXP:=$(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(COMMON_EDITOR_OBJS))) MIDI_OBJS_EXP:=$(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(MIDI_OBJS))) @@ -557,13 +556,12 @@ DUKE3D_EDITOR_OBJS_EXP:=$(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(DUKE3D_EDIT SW=sw -SW_ROOT=$(DUKE3D_SRC)/sw +SW_ROOT=$(source)/$(SW) SW_SRC=$(SW_ROOT)/src -SW_INC=$(SW_SRC) SW_RSRC=$(SW_ROOT)/rsrc SW_OBJ=$(obj)/$(SW) -SW_CFLAGS=-I$(SW_INC) +SW_CFLAGS=-I$(SW_SRC) SW_GAME ?= voidsw SW_EDITOR ?= voidsw-editor @@ -674,7 +672,7 @@ SW_EDITOR_OBJS_EXP:=$(addprefix $(SW_OBJ)/,$(addsuffix .$o,$(SW_EDITOR_OBJS))) ifeq ($(PRETTY_OUTPUT),1) .SILENT: endif -.PHONY: all duke3d test sw veryclean clean cleanduke3d cleantest cleansw cleanutils utils dxutils sdlutils printutils printsdlutils printdxutils rev $(DUKE3D_OBJ)/rev.$o +.PHONY: all duke3d test kenbuild sw veryclean clean cleanduke3d cleantest cleansw cleanutils utils dxutils sdlutils printutils printsdlutils printdxutils cleantools tools dxtools sdltools printtools printsdltools printdxtools rev $(ENGINE_OBJ)/rev.$o .SUFFIXES: # TARGETS @@ -685,7 +683,7 @@ duke3d: start $(DUKE3D_GAME)$(EXESUFFIX) $(DUKE3D_EDITOR)$(EXESUFFIX) @ls -l $(DUKE3D_GAME)$(EXESUFFIX) @ls -l $(DUKE3D_EDITOR)$(EXESUFFIX) -test: start $(KENBUILD_GAME)$(EXESUFFIX) $(KENBUILD_EDITOR)$(EXESUFFIX) +kenbuild: start $(KENBUILD_GAME)$(EXESUFFIX) $(KENBUILD_EDITOR)$(EXESUFFIX) @ls -l $(KENBUILD_GAME)$(EXESUFFIX) @ls -l $(KENBUILD_EDITOR)$(EXESUFFIX) @@ -699,13 +697,13 @@ ebacktrace: start $(EBACKTRACEDLL) start: $(BUILD_STARTED) -utils: $(addsuffix $(EXESUFFIX),$(UTILS) $(GAMEUTILS)) +tools: $(addsuffix $(EXESUFFIX),$(TOOLS_TARGETS)) @ls -l $^ -dxutils: $(addsuffix $(EXESUFFIX),$(DXUTILS)) +dxtools: $(addsuffix $(EXESUFFIX),$(DXTOOLS_TARGETS)) @ls -l $^ -sdlutils: $(addsuffix $(EXESUFFIX),$(SDLUTILS)) +sdltools: $(addsuffix $(EXESUFFIX),$(SDLTOOLS_TARGETS)) @ls -l $^ ifeq ($(PLATFORM),WII) @@ -719,7 +717,7 @@ $(SW_EDITOR)$(DOLSUFFIX): $(SW_EDITOR)$(EXESUFFIX) endif endif -$(KENBUILD_GAME)$(EXESUFFIX): $(KENBUILD_GAME_OBJS_EXP) $(COMMON_OBJS_EXP) $(ENGINE_OBJS_EXP) +$(KENBUILD_GAME)$(EXESUFFIX): $(KENBUILD_GAME_OBJS_EXP) $(ENGINE_OBJS_EXP) $(LINK_STATUS) $(RECIPE_IF) $(LINKER) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(GUI_LIBS) $(LIBDIRS) $(LIBS) $(RECIPE_RESULT_LINK) ifeq ($(PLATFORM),WII) @@ -743,7 +741,7 @@ ifneq ($(STRIP),) $(STRIP) $@ endif -$(DUKE3D_GAME)$(EXESUFFIX): $(DUKE3D_GAME_OBJS_EXP) $(COMMON_OBJS_EXP) $(MIDI_OBJS_EXP) $(ENGINE_OBJS_EXP) $(MACT_OBJS_EXP) $(AUDIOLIB_OBJS_EXP) $(ENET_TARGET) $(DUKE3D_GAME_MISCDEPS) +$(DUKE3D_GAME)$(EXESUFFIX): $(DUKE3D_GAME_OBJS_EXP) $(MIDI_OBJS_EXP) $(ENGINE_OBJS_EXP) $(MACT_OBJS_EXP) $(AUDIOLIB_OBJS_EXP) $(ENET_TARGET) $(DUKE3D_GAME_MISCDEPS) $(LINK_STATUS) $(RECIPE_IF) $(LINKER) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(GUI_LIBS) $(DUKE3D_GAME_LDFLAGS) $(LIBDIRS) $(LIBS) $(RECIPE_RESULT_LINK) ifeq ($(PLATFORM),WII) @@ -777,7 +775,7 @@ ifeq ($(PLATFORM),DARWIN) cp -f "$(DUKE3D_EDITOR)$(EXESUFFIX)" "$(DUKE3D_EDITOR_PROPER).app/Contents/MacOS/" endif -$(SW_GAME)$(EXESUFFIX): $(SW_GAME_OBJS_EXP) $(COMMON_OBJS_EXP) $(MIDI_OBJS_EXP) $(ENGINE_OBJS_EXP) $(MACT_OBJS_EXP) $(AUDIOLIB_OBJS_EXP) +$(SW_GAME)$(EXESUFFIX): $(SW_GAME_OBJS_EXP) $(MIDI_OBJS_EXP) $(ENGINE_OBJS_EXP) $(MACT_OBJS_EXP) $(AUDIOLIB_OBJS_EXP) $(LINK_STATUS) $(RECIPE_IF) $(LINKER) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(GUI_LIBS) $(LIBDIRS) $(LIBS) $(RECIPE_RESULT_LINK) ifeq ($(PLATFORM),WII) @@ -801,9 +799,9 @@ ifneq ($(STRIP),) $(STRIP) $@ endif -include $(ENGINE_ROOT)/Makefile.deps -include Makefile.deps -include $(SW_ROOT)/Makefile.deps +include $(ENGINE_ROOT)/Dependencies.mak +include $(DUKE3D_ROOT)/Dependencies.mak +include $(SW_ROOT)/Dependencies.mak # RULES @@ -811,65 +809,38 @@ $(EBACKTRACEDLL): platform/Windows/src/backtrace.c $(COMPILE_STATUS) $(RECIPE_IF) $(CC) $(CONLYFLAGS) -O2 -ggdb -shared -Wall -Wextra -static-libgcc -I$(ENGINE_INC) -o $@ $^ -lbfd -liberty -limagehlp $(RECIPE_RESULT_COMPILE) -libcache1d$(DLLSUFFIX): $(ENGINE_SRC)/cache1d.c +libcache1d$(DLLSUFFIX): $(ENGINE_SRC)/cache1d.cpp $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) -Wall -Wextra -DCACHE1D_COMPRESS_ONLY -shared -fPIC $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_C) -Wall -Wextra -DCACHE1D_COMPRESS_ONLY -shared -fPIC $< -o $@ $(RECIPE_RESULT_COMPILE) -%$(EXESUFFIX): $(ENGINE_OBJ)/%.$o $(UTIL_OBJS_EXP) | $(ENGINE_OBJ) +%$(EXESUFFIX): $(TOOLS_OBJ)/%.$o $(TOOLS_OBJS_EXP) $(ONESTEP_STATUS) $(RECIPE_IF) $(LINKER) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(LIBDIRS) $(LIBS) $(RECIPE_RESULT_ONESTEP) -%$(EXESUFFIX): $(DUKE3D_OBJ)/%.$o | $(DUKE3D_OBJ) - $(ONESTEP_STATUS) - $(RECIPE_IF) $(LINKER) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(LIBDIRS) $(LIBS) $(RECIPE_RESULT_ONESTEP) - -enumdisplay$(EXESUFFIX): $(ENGINE_OBJ)/enumdisplay.$o +enumdisplay$(EXESUFFIX): $(TOOLS_OBJ)/enumdisplay.$o $(ONESTEP_STATUS) $(RECIPE_IF) $(LINKER) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(LIBDIRS) $(LIBS) -lgdi32 $(RECIPE_RESULT_ONESTEP) -getdxdidf$(EXESUFFIX): $(ENGINE_OBJ)/getdxdidf.$o +getdxdidf$(EXESUFFIX): $(TOOLS_OBJ)/getdxdidf.$o $(ONESTEP_STATUS) $(RECIPE_IF) $(LINKER) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(LIBDIRS) $(LIBS) -ldinput $(RECIPE_RESULT_ONESTEP) -makesdlkeytrans$(EXESUFFIX): $(ENGINE_OBJ)/makesdlkeytrans.$o - $(ONESTEP_STATUS) - $(RECIPE_IF) $(LINKER) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(LIBDIRS) $(LIBS) $(RECIPE_RESULT_ONESTEP) -arttool$(EXESUFFIX): $(ENGINE_OBJ)/arttool.$o - $(ONESTEP_STATUS) - $(RECIPE_IF) $(L_CXX) $(CXXONLYFLAGS) $(L_CXXONLYFLAGS) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(LIBDIRS) $(LIBS) $(STDCPPLIB) $(RECIPE_RESULT_ONESTEP) #### Lunatic # Create object files directly with luajit -$(DUKE3D_OBJ)/luaJIT_BC_%.$o: source/lunatic/%.lua | $(DUKE3D_OBJ) +$(DUKE3D_OBJ)/luaJIT_BC_%.$o: $(DUKE3D_SRC)/lunatic/%.lua | $(DUKE3D_OBJ) $(COMPILE_STATUS) $(RECIPE_IF) $(LUAJIT) -bg $(LUAJIT_BCOPTS) $< $@ $(RECIPE_RESULT_COMPILE) -# Same thing for defs*.ilua which I'm too reluctant to rename now: -# NOTE: The target path must match EXACTLY with that of the DEFS_BC_SIZE -# determination in Makefile.common, because it is embedded into the bytecode as -# debugging information. -$(DUKE3D_OBJ)/luaJIT_BC_%.$o: source/lunatic/%.ilua | $(DUKE3D_OBJ) - $(RECIPE_IF) $(LUAJIT) -bg $(LUAJIT_BCOPTS) $< $@ $(RECIPE_RESULT_COMPILE) - -$(DUKE3D_OBJ)/%.$o: $(DUKE3D_SRC)/lunatic/%.c | $(DUKE3D_OBJ) +$(DUKE3D_OBJ)/%.$o: $(DUKE3D_SRC)/lunatic/%.cpp | $(DUKE3D_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(DUKE3D_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_CXX) $(COMMONFLAGS) $(COMPILERFLAGS) $(DUKE3D_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) # List of exported symbols, OS X -$(DUKE3D_OBJ)/lunatic_dynsymlist_osx: $(DUKE3D_SRC)/lunatic/dynsymlist | $(DUKE3D_OBJ) +$(DUKE3D_OBJ)/lunatic_%_osx: $(DUKE3D_SRC)/lunatic/%.lds | $(DUKE3D_OBJ) sed 's/[{};]//g;s/[A-Za-z_][A-Za-z_0-9]*/_&/g' $< > $@ -$(DUKE3D_OBJ)/lunatic_dynsymlist_m32_osx: $(DUKE3D_SRC)/lunatic/dynsymlist_m32 | $(DUKE3D_OBJ) - sed 's/[{};]//g;s/[A-Za-z_][A-Za-z_0-9]*/_&/g' $< > $@ - -#$(DUKE3D_OBJ)/lunatic_aliases_list: $(DUKE3D_OBJ)/lunatic_dynsymlist_osx | $(DUKE3D_OBJ) -# sed 's/_\([A-Za-z_][A-Za-z_0-9]*\)/_\1 \1/g' $< > $@ - # List of exported symbols, Windows -$(DUKE3D_OBJ)/lunatic_eduke32.def: $(DUKE3D_SRC)/lunatic/dynsymlist | $(DUKE3D_OBJ) - echo EXPORTS > $@ - sed 's/[{};]//g' $< >> $@ - -$(DUKE3D_OBJ)/lunatic_mapster32.def: $(DUKE3D_SRC)/lunatic/dynsymlist_m32 | $(DUKE3D_OBJ) +$(DUKE3D_OBJ)/lunatic_%.def: $(DUKE3D_SRC)/lunatic/%.lds | $(DUKE3D_OBJ) echo EXPORTS > $@ sed 's/[{};]//g' $< >> $@ @@ -884,65 +855,57 @@ $(ENGINE_OBJ)/%.$o: $(ENGINE_SRC)/%.yasm | $(ENGINE_OBJ) $(RECIPE_IF) $(AS) $(ASFLAGS) $< -o $@ $(RECIPE_RESULT_COMPILE) # Comment out the following rule to debug a-c.o -$(ENGINE_OBJ)/a-c.$o: $(ENGINE_SRC)/a-c.c | $(ENGINE_OBJ) +$(ENGINE_OBJ)/a-c.$o: $(ENGINE_SRC)/a-c.cpp | $(ENGINE_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(subst -O$(OPTLEVEL),-O2,$(subst $(CLANG_DEBUG_FLAGS),,$(COMMONFLAGS) $(COMPILERFLAGS))) $(ENGINE_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_CXX) $(subst -O$(OPTLEVEL),-O2,$(subst $(CLANG_DEBUG_FLAGS),,$(COMMONFLAGS) $(COMPILERFLAGS))) $(ENGINE_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) $(ENGINE_OBJ)/%.$o: $(ENGINE_SRC)/%.c | $(ENGINE_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENGINE_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_C) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENGINE_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) -$(ENGINE_OBJ)/%.$o: $(ENGINE_SRC)/%.m | $(ENGINE_OBJ) +$(ENGINE_OBJ)/%.$o: $(ENGINE_SRC)/%.cpp | $(ENGINE_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER_OBJC) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENGINE_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_CXX) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENGINE_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + +$(ENGINE_OBJ)/rev.$o: $(ENGINE_SRC)/rev.cpp | $(ENGINE_OBJ) + $(COMPILE_STATUS) + $(RECIPE_IF) $(COMPILER_CXX) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENGINE_CFLAGS) $(REVFLAG) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + +$(ENGINE_OBJ)/%.$o: $(ENGINE_SRC)/%.mm | $(ENGINE_OBJ) + $(COMPILE_STATUS) + $(RECIPE_IF) $(COMPILER_OBJCXX) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENGINE_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) $(ENGINE_OBJ)/%.$o: $(ENGINE_SRC)/%.cpp | $(ENGINE_OBJ) $(COMPILE_STATUS) $(RECIPE_IF) $(CXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENGINE_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) -$(ENGINE_OBJ)/%.$o: $(ENGINE_SRC)/misc/%.c | $(ENGINE_OBJ) +$(TOOLS_OBJ)/%.$o: $(TOOLS_SRC)/%.cpp | $(TOOLS_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENGINE_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_CXX) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENGINE_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) -$(ENGINE_OBJ)/%.$o: $(ENGINE_SRC)/util/%.c | $(ENGINE_OBJ) +$(MACT_OBJ)/%.$o: $(MACT_SRC)/%.cpp | $(MACT_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENGINE_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_CXX) $(COMMONFLAGS) $(COMPILERFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) -$(ENGINE_OBJ)/%.$o: $(ENGINE_SRC)/util/%.cpp | $(ENGINE_OBJ) +$(AUDIOLIB_OBJ)/%.o: $(AUDIOLIB_SRC)/%.cpp | $(AUDIOLIB_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(CXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENGINE_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) - -$(ENGINE_OBJ)/%.$o: $(ENGINE_SRC)/util/%.cc | $(ENGINE_OBJ) - $(COMPILE_STATUS) - $(RECIPE_IF) $(CXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENGINE_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) - -$(ENGINE_OBJ)/%.$o: $(DUKE3D_RSRC)/%.c | $(ENGINE_OBJ) - $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) - -$(MACT_OBJ)/%.$o: $(MACT_SRC)/%.c | $(MACT_OBJ) - $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) - -$(AUDIOLIB_OBJ)/%.o: $(AUDIOLIB_SRC)/%.c | $(AUDIOLIB_OBJ) - $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(AUDIOLIB_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_CXX) $(COMMONFLAGS) $(COMPILERFLAGS) $(AUDIOLIB_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) $(ENET_OBJ)/%.o: $(ENET_SRC)/%.c $(ENET_INC)/enet/*.h | $(ENET_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENET_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_C) $(COMMONFLAGS) $(COMPILERFLAGS) $(ENET_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) -$(KENBUILD_OBJ)/%.$o: $(KENBUILD_SRC)/%.c | $(KENBUILD_OBJ) +$(KENBUILD_OBJ)/%.$o: $(KENBUILD_SRC)/%.cpp | $(KENBUILD_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(KENBUILD_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_CXX) $(COMMONFLAGS) $(COMPILERFLAGS) $(KENBUILD_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) $(KENBUILD_OBJ)/%.$o: $(KENBUILD_OBJ)/%.c $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(KENBUILD_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_C) $(COMMONFLAGS) $(COMPILERFLAGS) $(KENBUILD_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) -$(KENBUILD_OBJ)/%.$o: $(KENBUILD_SRC)/%.m | $(KENBUILD_OBJ) +$(KENBUILD_OBJ)/%.$o: $(KENBUILD_SRC)/%.mm | $(KENBUILD_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER_OBJC) $(COMMONFLAGS) $(COMPILERFLAGS) $(KENBUILD_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_OBJCXX) $(COMMONFLAGS) $(COMPILERFLAGS) $(KENBUILD_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) $(KENBUILD_OBJ)/%.$o: $(KENBUILD_RSRC)/%.rc | $(KENBUILD_OBJ) $(COMPILE_STATUS) @@ -950,59 +913,47 @@ $(KENBUILD_OBJ)/%.$o: $(KENBUILD_RSRC)/%.rc | $(KENBUILD_OBJ) $(KENBUILD_OBJ)/%.$o: $(KENBUILD_RSRC)/%.c | $(KENBUILD_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(KENBUILD_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_C) $(COMMONFLAGS) $(COMPILERFLAGS) $(KENBUILD_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) $(KENBUILD_OBJ)/%_banner.c: $(KENBUILD_RSRC)/%.bmp | $(KENBUILD_OBJ) echo "#include \"gtkpixdata_shim.h\"" > $@ gdk-pixbuf-csource --extern --struct --raw --name=startbanner_pixdata $^ | sed 's/load_inc//' >> $@ -$(DUKE3D_OBJ)/%.$o: $(DUKE3D_SRC)/%.c | $(DUKE3D_OBJ) +$(DUKE3D_OBJ)/%.$o: $(DUKE3D_SRC)/%.cpp | $(DUKE3D_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(DUKE3D_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_CXX) $(COMMONFLAGS) $(COMPILERFLAGS) $(DUKE3D_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) $(DUKE3D_OBJ)/%.$o: $(DUKE3D_OBJ)/%.c $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(DUKE3D_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_C) $(COMMONFLAGS) $(COMPILERFLAGS) $(DUKE3D_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) -$(DUKE3D_OBJ)/rev.$o: $(DUKE3D_SRC)/rev.c | $(DUKE3D_OBJ) +$(DUKE3D_OBJ)/%.$o: $(DUKE3D_SRC)/%.mm | $(DUKE3D_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(DUKE3D_CFLAGS) $(REVFLAG) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_OBJCXX) $(COMMONFLAGS) $(COMPILERFLAGS) $(DUKE3D_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) -$(DUKE3D_OBJ)/%.$o: $(DUKE3D_SRC)/util/%.c | $(DUKE3D_OBJ) - $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(DUKE3D_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) - -$(DUKE3D_OBJ)/%.$o: $(DUKE3D_SRC)/%.m | $(DUKE3D_OBJ) - $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER_OBJC) $(COMMONFLAGS) $(COMPILERFLAGS) $(DUKE3D_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) - -$(DUKE3D_OBJ)/%.$o: $(DUKE3D_SRC)/%.cpp | $(DUKE3D_OBJ) - $(COMPILE_STATUS) - $(RECIPE_IF) $(CXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(COMPILERFLAGS) $(DUKE3D_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) - -$(DUKE3D_OBJ)/%.$o: $(DUKE3D_SRC)/misc/%.rc | $(DUKE3D_OBJ) +$(DUKE3D_OBJ)/%.$o: $(DUKE3D_RSRC)/%.rc | $(DUKE3D_OBJ) $(COMPILE_STATUS) $(RECIPE_IF) $(RC) -i $< -o $@ --include-dir=$(ENGINE_INC) --include-dir=$(DUKE3D_SRC) --include-dir=$(DUKE3D_RSRC) -DPOLYMER=$(POLYMER) $(RECIPE_RESULT_COMPILE) $(DUKE3D_OBJ)/%.$o: $(DUKE3D_RSRC)/%.c | $(DUKE3D_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(DUKE3D_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_C) $(COMMONFLAGS) $(COMPILERFLAGS) $(DUKE3D_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) $(DUKE3D_OBJ)/%_banner.c: $(DUKE3D_RSRC)/%.bmp | $(DUKE3D_OBJ) echo "#include \"gtkpixdata_shim.h\"" > $@ gdk-pixbuf-csource --extern --struct --raw --name=startbanner_pixdata $^ | sed 's/load_inc//' >> $@ -$(SW_OBJ)/%.$o: $(SW_SRC)/%.c | $(SW_OBJ) +$(SW_OBJ)/%.$o: $(SW_SRC)/%.cpp | $(SW_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(SW_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_CXX) $(COMMONFLAGS) $(COMPILERFLAGS) $(SW_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) $(SW_OBJ)/%.$o: $(SW_OBJ)/%.c $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(SW_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_C) $(COMMONFLAGS) $(COMPILERFLAGS) $(SW_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) -$(SW_OBJ)/%.$o: $(SW_SRC)/%.m | $(SW_OBJ) +$(SW_OBJ)/%.$o: $(SW_SRC)/%.mm | $(SW_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER_OBJC) $(COMMONFLAGS) $(COMPILERFLAGS) $(SW_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_OBJCXX) $(COMMONFLAGS) $(COMPILERFLAGS) $(SW_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) $(SW_OBJ)/%.$o: $(SW_RSRC)/%.rc | $(SW_OBJ) $(COMPILE_STATUS) @@ -1010,7 +961,7 @@ $(SW_OBJ)/%.$o: $(SW_RSRC)/%.rc | $(SW_OBJ) $(SW_OBJ)/%.$o: $(SW_RSRC)/%.c | $(SW_OBJ) $(COMPILE_STATUS) - $(RECIPE_IF) $(COMPILER) $(COMMONFLAGS) $(COMPILERFLAGS) $(SW_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) + $(RECIPE_IF) $(COMPILER_C) $(COMMONFLAGS) $(COMPILERFLAGS) $(SW_CFLAGS) -c $< -o $@ $(RECIPE_RESULT_COMPILE) $(SW_OBJ)/%_banner.c: $(SW_RSRC)/%.bmp | $(SW_OBJ) echo "#include \"gtkpixdata_shim.h\"" > $@ @@ -1019,15 +970,11 @@ $(SW_OBJ)/%_banner.c: $(SW_RSRC)/%.bmp | $(SW_OBJ) $(obj): -mkdir $@ $(DONT_PRINT) $(DONT_FAIL) -$(ENGINE_OBJ) $(MACT_OBJ) $(AUDIOLIB_OBJ) $(ENET_OBJ) $(KENBUILD_OBJ) $(DUKE3D_OBJ) $(SW_OBJ): | $(obj) +$(ENGINE_OBJ) $(TOOLS_OBJ) $(KENBUILD_OBJ) $(AUDIOLIB_OBJ) $(MACT_OBJ) $(DUKE3D_OBJ) $(SW_OBJ) $(ENET_OBJ): | $(obj) -mkdir $@ $(DONT_PRINT) $(DONT_FAIL) ## PHONIES -veryclean: clean - -# Delete executables, object files created from sources in source/, and -# miscellaneous generated files related to Lunatic on non-Linux. cleanduke3d: -rm -f $(DUKE3D_GAME)$(EXESUFFIX) $(DUKE3D_EDITOR)$(EXESUFFIX) ifeq ($(PLATFORM),DARWIN) @@ -1040,20 +987,33 @@ cleantest: cleansw: -rm -f $(SW_GAME)$(EXESUFFIX) $(SW_EDITOR)$(EXESUFFIX) -cleanutils: - -rm -f $(addsuffix $(EXESUFFIX),$(UTILS) $(GAMEUTILS)) +cleantools: + -rm -f $(addsuffix $(EXESUFFIX),$(TOOLS_TARGETS) $(DXTOOLS_TARGETS) $(SDLTOOLS_TARGETS)) -clean: cleanduke3d cleanutils +clean: cleanduke3d cleantools -rm -rf $(obj)/ -rm -f $(EBACKTRACEDLL) -printutils: - echo "$(addsuffix $(EXESUFFIX),$(UTILS) $(GAMEUTILS))" +printtools: + echo "$(addsuffix $(EXESUFFIX),$(TOOLS_TARGETS))" -printdxutils: - echo "$(addsuffix $(EXESUFFIX),$(DXUTILS))" +printdxtools: + echo "$(addsuffix $(EXESUFFIX),$(DXTOOLS_TARGETS))" -printsdlutils: - echo "$(addsuffix $(EXESUFFIX),$(SDLUTILS))" +printsdltools: + echo "$(addsuffix $(EXESUFFIX),$(SDLTOOLS_TARGETS))" -rev: $(DUKE3D_OBJ)/rev.$o +rev: $(ENGINE_OBJ)/rev.$o + + +# Compatibility + +test: kenbuild +utils: tools +dxutils: dxtools +sdlutils: sdltools +printutils: printtools +printdxutils: printdxtools +printsdlutils: printsdltools +veryclean: clean +cleanutils: cleantools diff --git a/platform/Apple/EDuke32.xcodeproj/project.pbxproj b/platform/Apple/EDuke32.xcodeproj/project.pbxproj index 626a3dcfd..14025f091 100644 --- a/platform/Apple/EDuke32.xcodeproj/project.pbxproj +++ b/platform/Apple/EDuke32.xcodeproj/project.pbxproj @@ -22,43 +22,42 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 0006DA2319F214A600A17995 /* grpscan.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BC19F1AD9B0091588D /* grpscan.c */; }; + 0006DA2319F214A600A17995 /* grpscan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BC19F1AD9B0091588D /* grpscan.cpp */; }; 0006DA2419F2153500A17995 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00970E6019F2142400873EB9 /* CoreAudio.framework */; }; 0008E64F19F1A66E0091588D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0008E64E19F1A66E0091588D /* Cocoa.framework */; }; 0008E68719F1A8F10091588D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0008E64E19F1A66E0091588D /* Cocoa.framework */; }; 0008E6E919F1AAFF0091588D /* fx_man.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E6CF19F1AAFE0091588D /* fx_man.h */; settings = {ATTRIBUTES = (Public, ); }; }; 0008E6EA19F1AAFF0091588D /* music.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E6D019F1AAFE0091588D /* music.h */; settings = {ATTRIBUTES = (Public, ); }; }; 0008E6EC19F1AAFF0091588D /* _multivc.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E6D319F1AAFE0091588D /* _multivc.h */; }; - 0008E6F119F1AAFF0091588D /* driver_sdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6D819F1AAFF0091588D /* driver_sdl.c */; }; + 0008E6F119F1AAFF0091588D /* driver_sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6D819F1AAFF0091588D /* driver_sdl.cpp */; }; 0008E6F219F1AAFF0091588D /* driver_sdl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E6D919F1AAFF0091588D /* driver_sdl.h */; }; - 0008E6F319F1AAFF0091588D /* drivers.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DA19F1AAFF0091588D /* drivers.c */; }; - 0008E6F519F1AAFF0091588D /* flac.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DC19F1AAFF0091588D /* flac.c */; }; - 0008E6F619F1AAFF0091588D /* formats.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DD19F1AAFF0091588D /* formats.c */; }; - 0008E6F719F1AAFF0091588D /* fx_man.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DE19F1AAFF0091588D /* fx_man.c */; }; + 0008E6F319F1AAFF0091588D /* drivers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DA19F1AAFF0091588D /* drivers.cpp */; }; + 0008E6F519F1AAFF0091588D /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DC19F1AAFF0091588D /* flac.cpp */; }; + 0008E6F619F1AAFF0091588D /* formats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DD19F1AAFF0091588D /* formats.cpp */; }; + 0008E6F719F1AAFF0091588D /* fx_man.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DE19F1AAFF0091588D /* fx_man.cpp */; }; 0008E6F819F1AAFF0091588D /* linklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E6DF19F1AAFF0091588D /* linklist.h */; }; - 0008E6FA19F1AAFF0091588D /* mix.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E119F1AAFF0091588D /* mix.c */; }; - 0008E6FB19F1AAFF0091588D /* mixst.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E219F1AAFF0091588D /* mixst.c */; }; - 0008E6FC19F1AAFF0091588D /* multivoc.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E319F1AAFF0091588D /* multivoc.c */; }; + 0008E6FA19F1AAFF0091588D /* mix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E119F1AAFF0091588D /* mix.cpp */; }; + 0008E6FB19F1AAFF0091588D /* mixst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E219F1AAFF0091588D /* mixst.cpp */; }; + 0008E6FC19F1AAFF0091588D /* multivoc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E319F1AAFF0091588D /* multivoc.cpp */; }; 0008E6FD19F1AAFF0091588D /* multivoc.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E6E419F1AAFF0091588D /* multivoc.h */; }; - 0008E6FE19F1AAFF0091588D /* pitch.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E519F1AAFF0091588D /* pitch.c */; }; + 0008E6FE19F1AAFF0091588D /* pitch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E519F1AAFF0091588D /* pitch.cpp */; }; 0008E6FF19F1AAFF0091588D /* pitch.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E6E619F1AAFF0091588D /* pitch.h */; }; - 0008E70019F1AAFF0091588D /* vorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E719F1AAFF0091588D /* vorbis.c */; }; - 0008E70119F1AAFF0091588D /* xa.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E819F1AAFF0091588D /* xa.c */; }; + 0008E70019F1AAFF0091588D /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E719F1AAFF0091588D /* vorbis.cpp */; }; + 0008E70119F1AAFF0091588D /* xa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E819F1AAFF0091588D /* xa.cpp */; }; 0008E73519F1ABB80091588D /* _control.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E72319F1ABB80091588D /* _control.h */; }; 0008E73619F1ABB80091588D /* _scrplib.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E72419F1ABB80091588D /* _scrplib.h */; }; - 0008E73719F1ABB80091588D /* animlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72519F1ABB80091588D /* animlib.c */; }; + 0008E73719F1ABB80091588D /* animlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72519F1ABB80091588D /* animlib.cpp */; }; 0008E73819F1ABB80091588D /* animlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E72619F1ABB80091588D /* animlib.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0008E73919F1ABB80091588D /* control.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72719F1ABB80091588D /* control.c */; }; + 0008E73919F1ABB80091588D /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72719F1ABB80091588D /* control.cpp */; }; 0008E73A19F1ABB80091588D /* control.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E72819F1ABB80091588D /* control.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0008E73B19F1ABB80091588D /* file_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72919F1ABB80091588D /* file_lib.c */; }; + 0008E73B19F1ABB80091588D /* file_lib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72919F1ABB80091588D /* file_lib.cpp */; }; 0008E73C19F1ABB80091588D /* file_lib.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E72A19F1ABB80091588D /* file_lib.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0008E73D19F1ABB80091588D /* joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72B19F1ABB80091588D /* joystick.c */; }; + 0008E73D19F1ABB80091588D /* joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72B19F1ABB80091588D /* joystick.cpp */; }; 0008E73E19F1ABB80091588D /* joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E72C19F1ABB80091588D /* joystick.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0008E73F19F1ABB80091588D /* keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72D19F1ABB80091588D /* keyboard.c */; }; + 0008E73F19F1ABB80091588D /* keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72D19F1ABB80091588D /* keyboard.cpp */; }; 0008E74019F1ABB80091588D /* keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E72E19F1ABB80091588D /* keyboard.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0008E74319F1ABB80091588D /* mouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E73119F1ABB80091588D /* mouse.c */; }; 0008E74419F1ABB80091588D /* mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E73219F1ABB80091588D /* mouse.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0008E74519F1ABB80091588D /* scriplib.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E73319F1ABB80091588D /* scriplib.c */; }; + 0008E74519F1ABB80091588D /* scriplib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E73319F1ABB80091588D /* scriplib.cpp */; }; 0008E74619F1ABB80091588D /* scriplib.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E73419F1ABB80091588D /* scriplib.h */; settings = {ATTRIBUTES = (Public, ); }; }; 0008E92319F1AC540091588D /* a.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8A119F1AC530091588D /* a.h */; settings = {ATTRIBUTES = (Public, ); }; }; 0008E92419F1AC540091588D /* baselayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8A219F1AC530091588D /* baselayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -99,76 +98,76 @@ 0008E95219F1AC540091588D /* tracker_operator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8D119F1AC530091588D /* tracker_operator.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; 0008E95319F1AC540091588D /* tracker_operators.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8D219F1AC530091588D /* tracker_operators.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; 0008E95619F1AC540091588D /* xxhash.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8D519F1AC530091588D /* xxhash.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0008E95919F1AC540091588D /* baselayer.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DC19F1AC530091588D /* baselayer.c */; }; - 0008E95B19F1AC540091588D /* cache1d.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DE19F1AC530091588D /* cache1d.c */; }; - 0008E95C19F1AC540091588D /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DF19F1AC530091588D /* common.c */; }; - 0008E95D19F1AC540091588D /* compat.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E019F1AC530091588D /* compat.c */; }; - 0008E95F19F1AC540091588D /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E219F1AC530091588D /* crc32.c */; }; - 0008E96019F1AC540091588D /* defs.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E319F1AC530091588D /* defs.c */; }; - 0008E96119F1AC540091588D /* dxtfilter.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E419F1AC530091588D /* dxtfilter.c */; }; - 0008E96319F1AC540091588D /* engine.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E619F1AC530091588D /* engine.c */; }; + 0008E95919F1AC540091588D /* baselayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DC19F1AC530091588D /* baselayer.cpp */; }; + 0008E95B19F1AC540091588D /* cache1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DE19F1AC530091588D /* cache1d.cpp */; }; + 0008E95C19F1AC540091588D /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DF19F1AC530091588D /* common.cpp */; }; + 0008E95D19F1AC540091588D /* compat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E019F1AC530091588D /* compat.cpp */; }; + 0008E95F19F1AC540091588D /* crc32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E219F1AC530091588D /* crc32.cpp */; }; + 0008E96019F1AC540091588D /* defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E319F1AC530091588D /* defs.cpp */; }; + 0008E96119F1AC540091588D /* dxtfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E419F1AC530091588D /* dxtfilter.cpp */; }; + 0008E96319F1AC540091588D /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E619F1AC530091588D /* engine.cpp */; }; 0008E96419F1AC540091588D /* engine_oldmap.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8E719F1AC540091588D /* engine_oldmap.h */; }; 0008E96519F1AC540091588D /* engine_priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8E819F1AC540091588D /* engine_priv.h */; }; - 0008E96619F1AC540091588D /* glbuild.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E919F1AC540091588D /* glbuild.c */; }; - 0008E96819F1AC540091588D /* hightile.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8EB19F1AC540091588D /* hightile.c */; }; - 0008E96919F1AC540091588D /* kplib.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8EC19F1AC540091588D /* kplib.c */; }; + 0008E96619F1AC540091588D /* glbuild.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E919F1AC540091588D /* glbuild.cpp */; }; + 0008E96819F1AC540091588D /* hightile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8EB19F1AC540091588D /* hightile.cpp */; }; + 0008E96919F1AC540091588D /* kplib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8EC19F1AC540091588D /* kplib.cpp */; }; 0008E96B19F1AC540091588D /* lz4.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8EE19F1AC540091588D /* lz4.c */; }; - 0008E96D19F1AC540091588D /* mdsprite.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F019F1AC540091588D /* mdsprite.c */; }; - 0008E97219F1AC540091588D /* mmulti_null.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F619F1AC540091588D /* mmulti_null.c */; }; - 0008E97319F1AC540091588D /* mutex.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F719F1AC540091588D /* mutex.c */; }; - 0008E97419F1AC540091588D /* osd.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F819F1AC540091588D /* osd.c */; }; - 0008E97519F1AC540091588D /* osxbits.m in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F919F1AC540091588D /* osxbits.m */; }; - 0008E97619F1AC540091588D /* polymer.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FA19F1AC540091588D /* polymer.c */; }; - 0008E97719F1AC540091588D /* polymost.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FB19F1AC540091588D /* polymost.c */; }; - 0008E97819F1AC540091588D /* pragmas.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FC19F1AC540091588D /* pragmas.c */; }; - 0008E97A19F1AC540091588D /* scriptfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FE19F1AC540091588D /* scriptfile.c */; }; - 0008E97B19F1AC540091588D /* sdlayer.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FF19F1AC540091588D /* sdlayer.c */; }; - 0008E97E19F1AC540091588D /* smalltextfont.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90219F1AC540091588D /* smalltextfont.c */; }; - 0008E98219F1AC540091588D /* texcache.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90619F1AC540091588D /* texcache.c */; }; - 0008E98319F1AC540091588D /* textfont.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90719F1AC540091588D /* textfont.c */; }; - 0008E99519F1AC540091588D /* voxmodel.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E91F19F1AC540091588D /* voxmodel.c */; }; + 0008E96D19F1AC540091588D /* mdsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F019F1AC540091588D /* mdsprite.cpp */; }; + 0008E97219F1AC540091588D /* mmulti_null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F619F1AC540091588D /* mmulti_null.cpp */; }; + 0008E97319F1AC540091588D /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F719F1AC540091588D /* mutex.cpp */; }; + 0008E97419F1AC540091588D /* osd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F819F1AC540091588D /* osd.cpp */; }; + 0008E97519F1AC540091588D /* osxbits.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F919F1AC540091588D /* osxbits.mm */; }; + 0008E97619F1AC540091588D /* polymer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FA19F1AC540091588D /* polymer.cpp */; }; + 0008E97719F1AC540091588D /* polymost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FB19F1AC540091588D /* polymost.cpp */; }; + 0008E97819F1AC540091588D /* pragmas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FC19F1AC540091588D /* pragmas.cpp */; }; + 0008E97A19F1AC540091588D /* scriptfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FE19F1AC540091588D /* scriptfile.cpp */; }; + 0008E97B19F1AC540091588D /* sdlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FF19F1AC540091588D /* sdlayer.cpp */; }; + 0008E97E19F1AC540091588D /* smalltextfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90219F1AC540091588D /* smalltextfont.cpp */; }; + 0008E98219F1AC540091588D /* texcache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90619F1AC540091588D /* texcache.cpp */; }; + 0008E98319F1AC540091588D /* textfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90719F1AC540091588D /* textfont.cpp */; }; + 0008E99519F1AC540091588D /* voxmodel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E91F19F1AC540091588D /* voxmodel.cpp */; }; 0008E99819F1AC540091588D /* xxhash.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E92219F1AC540091588D /* xxhash.c */; }; - 0008E9E419F1AD9B0091588D /* actors.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E99E19F1AD9B0091588D /* actors.c */; }; - 0008E9E519F1AD9B0091588D /* anim.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A019F1AD9B0091588D /* anim.c */; }; - 0008E9E619F1AD9B0091588D /* animvpx.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A219F1AD9B0091588D /* animvpx.c */; }; - 0008E9E719F1AD9B0091588D /* config.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A419F1AD9B0091588D /* config.c */; }; - 0008E9E819F1AD9B0091588D /* demo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A619F1AD9B0091588D /* demo.c */; }; - 0008E9EA19F1AD9B0091588D /* game.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9AC19F1AD9B0091588D /* game.c */; }; - 0008E9EB19F1AD9B0091588D /* gamedef.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9AE19F1AD9B0091588D /* gamedef.c */; }; - 0008E9EC19F1AD9B0091588D /* gameexec.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B119F1AD9B0091588D /* gameexec.c */; }; - 0008E9ED19F1AD9B0091588D /* GameListSource.game.m in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B419F1AD9B0091588D /* GameListSource.game.m */; }; - 0008E9EF19F1AD9B0091588D /* gamevars.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B619F1AD9B0091588D /* gamevars.c */; }; - 0008E9F019F1AD9B0091588D /* global.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B819F1AD9B0091588D /* global.c */; }; - 0008E9F119F1AD9B0091588D /* GrpFile.game.m in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BB19F1AD9B0091588D /* GrpFile.game.m */; }; - 0008E9F219F1AD9B0091588D /* grpscan.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BC19F1AD9B0091588D /* grpscan.c */; }; - 0008E9F319F1AD9B0091588D /* input.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BE19F1AD9B0091588D /* input.c */; }; - 0008E9F419F1AD9B0091588D /* menus.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C219F1AD9B0091588D /* menus.c */; }; - 0008E9F519F1AD9B0091588D /* namesdyn.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C519F1AD9B0091588D /* namesdyn.c */; }; - 0008E9F619F1AD9B0091588D /* net.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C719F1AD9B0091588D /* net.c */; }; - 0008E9F719F1AD9B0091588D /* osdcmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C919F1AD9B0091588D /* osdcmds.c */; }; - 0008E9F819F1AD9B0091588D /* osdfuncs.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CB19F1AD9B0091588D /* osdfuncs.c */; }; - 0008E9F919F1AD9B0091588D /* player.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CD19F1AD9B0091588D /* player.c */; }; - 0008E9FA19F1AD9B0091588D /* premap.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CF19F1AD9B0091588D /* premap.c */; }; - 0008E9FB19F1AD9B0091588D /* rev.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D219F1AD9B0091588D /* rev.c */; }; - 0008E9FC19F1AD9B0091588D /* rts.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D319F1AD9B0091588D /* rts.c */; }; - 0008E9FD19F1AD9B0091588D /* savegame.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D519F1AD9B0091588D /* savegame.c */; }; - 0008E9FE19F1AD9B0091588D /* sdlmusic.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D719F1AD9B0091588D /* sdlmusic.c */; }; - 0008EA0019F1AD9B0091588D /* sector.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9DA19F1AD9B0091588D /* sector.c */; }; - 0008EA0119F1AD9B0091588D /* sounds.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9DD19F1AD9B0091588D /* sounds.c */; }; - 0008EA0219F1AD9B0091588D /* soundsdyn.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9DF19F1AD9B0091588D /* soundsdyn.c */; }; - 0008EA0319F1AD9B0091588D /* startosx.game.m in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9E219F1AD9B0091588D /* startosx.game.m */; }; - 0008EA0719F1ADC90091588D /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA0519F1ADC90091588D /* common.c */; }; - 0008EA0819F1ADC90091588D /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA0519F1ADC90091588D /* common.c */; }; - 0008EA0919F1ADD80091588D /* build.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DD19F1AC530091588D /* build.c */; }; - 0008EA0A19F1ADD80091588D /* config.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E119F1AC530091588D /* config.c */; }; - 0008EA0B19F1ADD80091588D /* startosx.editor.m in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90419F1AC540091588D /* startosx.editor.m */; }; + 0008E9E419F1AD9B0091588D /* actors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E99E19F1AD9B0091588D /* actors.cpp */; }; + 0008E9E519F1AD9B0091588D /* anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A019F1AD9B0091588D /* anim.cpp */; }; + 0008E9E619F1AD9B0091588D /* animvpx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A219F1AD9B0091588D /* animvpx.cpp */; }; + 0008E9E719F1AD9B0091588D /* config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A419F1AD9B0091588D /* config.cpp */; }; + 0008E9E819F1AD9B0091588D /* demo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A619F1AD9B0091588D /* demo.cpp */; }; + 0008E9EA19F1AD9B0091588D /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9AC19F1AD9B0091588D /* game.cpp */; }; + 0008E9EB19F1AD9B0091588D /* gamedef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9AE19F1AD9B0091588D /* gamedef.cpp */; }; + 0008E9EC19F1AD9B0091588D /* gameexec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B119F1AD9B0091588D /* gameexec.cpp */; }; + 0008E9ED19F1AD9B0091588D /* GameListSource.game.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B419F1AD9B0091588D /* GameListSource.game.mm */; }; + 0008E9EF19F1AD9B0091588D /* gamevars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B619F1AD9B0091588D /* gamevars.cpp */; }; + 0008E9F019F1AD9B0091588D /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B819F1AD9B0091588D /* global.cpp */; }; + 0008E9F119F1AD9B0091588D /* GrpFile.game.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BB19F1AD9B0091588D /* GrpFile.game.mm */; }; + 0008E9F219F1AD9B0091588D /* grpscan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BC19F1AD9B0091588D /* grpscan.cpp */; }; + 0008E9F319F1AD9B0091588D /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BE19F1AD9B0091588D /* input.cpp */; }; + 0008E9F419F1AD9B0091588D /* menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C219F1AD9B0091588D /* menus.cpp */; }; + 0008E9F519F1AD9B0091588D /* namesdyn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C519F1AD9B0091588D /* namesdyn.cpp */; }; + 0008E9F619F1AD9B0091588D /* net.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C719F1AD9B0091588D /* net.cpp */; }; + 0008E9F719F1AD9B0091588D /* osdcmds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C919F1AD9B0091588D /* osdcmds.cpp */; }; + 0008E9F819F1AD9B0091588D /* osdfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CB19F1AD9B0091588D /* osdfuncs.cpp */; }; + 0008E9F919F1AD9B0091588D /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CD19F1AD9B0091588D /* player.cpp */; }; + 0008E9FA19F1AD9B0091588D /* premap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CF19F1AD9B0091588D /* premap.cpp */; }; + 0008E9FB19F1AD9B0091588D /* rev.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D219F1AD9B0091588D /* rev.cpp */; }; + 0008E9FC19F1AD9B0091588D /* rts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D319F1AD9B0091588D /* rts.cpp */; }; + 0008E9FD19F1AD9B0091588D /* savegame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D519F1AD9B0091588D /* savegame.cpp */; }; + 0008E9FE19F1AD9B0091588D /* sdlmusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D719F1AD9B0091588D /* sdlmusic.cpp */; }; + 0008EA0019F1AD9B0091588D /* sector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9DA19F1AD9B0091588D /* sector.cpp */; }; + 0008EA0119F1AD9B0091588D /* sounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9DD19F1AD9B0091588D /* sounds.cpp */; }; + 0008EA0219F1AD9B0091588D /* soundsdyn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9DF19F1AD9B0091588D /* soundsdyn.cpp */; }; + 0008EA0319F1AD9B0091588D /* startosx.game.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9E219F1AD9B0091588D /* startosx.game.mm */; }; + 0008EA0719F1ADC90091588D /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA0519F1ADC90091588D /* common.cpp */; }; + 0008EA0819F1ADC90091588D /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA0519F1ADC90091588D /* common.cpp */; }; + 0008EA0919F1ADD80091588D /* build.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DD19F1AC530091588D /* build.cpp */; }; + 0008EA0A19F1ADD80091588D /* config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E119F1AC530091588D /* config.cpp */; }; + 0008EA0B19F1ADD80091588D /* startosx.editor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90419F1AC540091588D /* startosx.editor.mm */; }; 0008EA0C19F1ADE70091588D /* build.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8A319F1AC530091588D /* build.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0008EA1619F1AE820091588D /* astub.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA0D19F1AE820091588D /* astub.c */; }; - 0008EA1719F1AE820091588D /* m32common.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA0E19F1AE820091588D /* m32common.c */; }; - 0008EA1819F1AE820091588D /* m32def.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA0F19F1AE820091588D /* m32def.c */; }; - 0008EA1919F1AE820091588D /* m32exec.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA1119F1AE820091588D /* m32exec.c */; }; - 0008EA1B19F1AE820091588D /* m32vars.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA1319F1AE820091588D /* m32vars.c */; }; - 0008EA1C19F1AE820091588D /* sounds_mapster32.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA1419F1AE820091588D /* sounds_mapster32.c */; }; + 0008EA1619F1AE820091588D /* astub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA0D19F1AE820091588D /* astub.cpp */; }; + 0008EA1719F1AE820091588D /* m32common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA0E19F1AE820091588D /* m32common.cpp */; }; + 0008EA1819F1AE820091588D /* m32def.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA0F19F1AE820091588D /* m32def.cpp */; }; + 0008EA1919F1AE820091588D /* m32exec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA1119F1AE820091588D /* m32exec.cpp */; }; + 0008EA1B19F1AE820091588D /* m32vars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA1319F1AE820091588D /* m32vars.cpp */; }; + 0008EA1C19F1AE820091588D /* sounds_mapster32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA1419F1AE820091588D /* sounds_mapster32.cpp */; }; 0008EA2019F1AEFC0091588D /* eduke32.icns in Resources */ = {isa = PBXBuildFile; fileRef = 0008EA1D19F1AEFC0091588D /* eduke32.icns */; }; 0008EA2319F1AF010091588D /* eduke32.icns in Resources */ = {isa = PBXBuildFile; fileRef = 0008EA1D19F1AEFC0091588D /* eduke32.icns */; }; 0008EA6319F1B04F0091588D /* callbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008EA5019F1B04F0091588D /* callbacks.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -207,31 +206,31 @@ 000C487019F35516006E6B52 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 000C486F19F35516006E6B52 /* CoreGraphics.framework */; }; 000C487819F35517006E6B52 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 000C487619F35517006E6B52 /* InfoPlist.strings */; }; 000C488019F35517006E6B52 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 000C487F19F35517006E6B52 /* Images.xcassets */; }; - 000C489919F35601006E6B52 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA0519F1ADC90091588D /* common.c */; }; - 000C489A19F35601006E6B52 /* actors.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E99E19F1AD9B0091588D /* actors.c */; }; - 000C489B19F35601006E6B52 /* anim.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A019F1AD9B0091588D /* anim.c */; }; - 000C489C19F35601006E6B52 /* config.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A419F1AD9B0091588D /* config.c */; }; - 000C489D19F35601006E6B52 /* demo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A619F1AD9B0091588D /* demo.c */; }; - 000C489E19F35601006E6B52 /* game.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9AC19F1AD9B0091588D /* game.c */; }; - 000C489F19F35601006E6B52 /* gamedef.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9AE19F1AD9B0091588D /* gamedef.c */; }; - 000C48A019F35601006E6B52 /* gameexec.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B119F1AD9B0091588D /* gameexec.c */; }; - 000C48A319F35601006E6B52 /* global.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B819F1AD9B0091588D /* global.c */; }; - 000C48A519F35601006E6B52 /* grpscan.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BC19F1AD9B0091588D /* grpscan.c */; }; - 000C48A619F35601006E6B52 /* input.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BE19F1AD9B0091588D /* input.c */; }; - 000C48A719F35601006E6B52 /* menus.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C219F1AD9B0091588D /* menus.c */; }; - 000C48A819F35601006E6B52 /* namesdyn.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C519F1AD9B0091588D /* namesdyn.c */; }; - 000C48A919F35601006E6B52 /* net.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C719F1AD9B0091588D /* net.c */; }; - 000C48AA19F35601006E6B52 /* osdcmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C919F1AD9B0091588D /* osdcmds.c */; }; - 000C48AB19F35601006E6B52 /* osdfuncs.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CB19F1AD9B0091588D /* osdfuncs.c */; }; - 000C48AC19F35601006E6B52 /* player.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CD19F1AD9B0091588D /* player.c */; }; - 000C48AD19F35601006E6B52 /* premap.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CF19F1AD9B0091588D /* premap.c */; }; - 000C48AE19F35601006E6B52 /* rev.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D219F1AD9B0091588D /* rev.c */; }; - 000C48AF19F35601006E6B52 /* rts.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D319F1AD9B0091588D /* rts.c */; }; - 000C48B019F35601006E6B52 /* savegame.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D519F1AD9B0091588D /* savegame.c */; }; - 000C48B119F35601006E6B52 /* sdlmusic.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D719F1AD9B0091588D /* sdlmusic.c */; }; - 000C48B219F35601006E6B52 /* sector.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9DA19F1AD9B0091588D /* sector.c */; }; - 000C48B319F35601006E6B52 /* sounds.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9DD19F1AD9B0091588D /* sounds.c */; }; - 000C48B419F35601006E6B52 /* soundsdyn.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9DF19F1AD9B0091588D /* soundsdyn.c */; }; + 000C489919F35601006E6B52 /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008EA0519F1ADC90091588D /* common.cpp */; }; + 000C489A19F35601006E6B52 /* actors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E99E19F1AD9B0091588D /* actors.cpp */; }; + 000C489B19F35601006E6B52 /* anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A019F1AD9B0091588D /* anim.cpp */; }; + 000C489C19F35601006E6B52 /* config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A419F1AD9B0091588D /* config.cpp */; }; + 000C489D19F35601006E6B52 /* demo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9A619F1AD9B0091588D /* demo.cpp */; }; + 000C489E19F35601006E6B52 /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9AC19F1AD9B0091588D /* game.cpp */; }; + 000C489F19F35601006E6B52 /* gamedef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9AE19F1AD9B0091588D /* gamedef.cpp */; }; + 000C48A019F35601006E6B52 /* gameexec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B119F1AD9B0091588D /* gameexec.cpp */; }; + 000C48A319F35601006E6B52 /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B819F1AD9B0091588D /* global.cpp */; }; + 000C48A519F35601006E6B52 /* grpscan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BC19F1AD9B0091588D /* grpscan.cpp */; }; + 000C48A619F35601006E6B52 /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BE19F1AD9B0091588D /* input.cpp */; }; + 000C48A719F35601006E6B52 /* menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C219F1AD9B0091588D /* menus.cpp */; }; + 000C48A819F35601006E6B52 /* namesdyn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C519F1AD9B0091588D /* namesdyn.cpp */; }; + 000C48A919F35601006E6B52 /* net.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C719F1AD9B0091588D /* net.cpp */; }; + 000C48AA19F35601006E6B52 /* osdcmds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C919F1AD9B0091588D /* osdcmds.cpp */; }; + 000C48AB19F35601006E6B52 /* osdfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CB19F1AD9B0091588D /* osdfuncs.cpp */; }; + 000C48AC19F35601006E6B52 /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CD19F1AD9B0091588D /* player.cpp */; }; + 000C48AD19F35601006E6B52 /* premap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CF19F1AD9B0091588D /* premap.cpp */; }; + 000C48AE19F35601006E6B52 /* rev.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D219F1AD9B0091588D /* rev.cpp */; }; + 000C48AF19F35601006E6B52 /* rts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D319F1AD9B0091588D /* rts.cpp */; }; + 000C48B019F35601006E6B52 /* savegame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D519F1AD9B0091588D /* savegame.cpp */; }; + 000C48B119F35601006E6B52 /* sdlmusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D719F1AD9B0091588D /* sdlmusic.cpp */; }; + 000C48B219F35601006E6B52 /* sector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9DA19F1AD9B0091588D /* sector.cpp */; }; + 000C48B319F35601006E6B52 /* sounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9DD19F1AD9B0091588D /* sounds.cpp */; }; + 000C48B419F35601006E6B52 /* soundsdyn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9DF19F1AD9B0091588D /* soundsdyn.cpp */; }; 000C48D519F35D7A006E6B52 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 000C48D419F35D6E006E6B52 /* libSDL2.a */; }; 000C48D719F35D92006E6B52 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 000C48D619F35D92006E6B52 /* UIKit.framework */; }; 000C48D919F35DA3006E6B52 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0008EA8119F1B1E20091588D /* AudioToolbox.framework */; }; @@ -241,34 +240,34 @@ 000C48E519F35DA9006E6B52 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 000C486D19F35516006E6B52 /* Foundation.framework */; }; 000C48E619F35DA9006E6B52 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 000C486F19F35516006E6B52 /* CoreGraphics.framework */; }; 000C48E719F35DAE006E6B52 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00970E6019F2142400873EB9 /* CoreAudio.framework */; }; - 000C48F219F35F42006E6B52 /* gamevars.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B619F1AD9B0091588D /* gamevars.c */; }; - 0013828B19F361B60007DA6C /* sdlayer.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FF19F1AC540091588D /* sdlayer.c */; }; - 0013828C19F361B60007DA6C /* compat.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E019F1AC530091588D /* compat.c */; }; - 0013828D19F361B60007DA6C /* kplib.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8EC19F1AC540091588D /* kplib.c */; }; - 0013828E19F361B60007DA6C /* engine.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E619F1AC530091588D /* engine.c */; }; - 0013828F19F361B60007DA6C /* voxmodel.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E91F19F1AC540091588D /* voxmodel.c */; }; - 0013829119F361B60007DA6C /* pragmas.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FC19F1AC540091588D /* pragmas.c */; }; - 0013829219F361B60007DA6C /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DF19F1AC530091588D /* common.c */; }; - 0013829319F361B60007DA6C /* mutex.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F719F1AC540091588D /* mutex.c */; }; - 0013829519F361B60007DA6C /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E219F1AC530091588D /* crc32.c */; }; - 0013829719F361B60007DA6C /* texcache.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90619F1AC540091588D /* texcache.c */; }; - 0013829819F361B60007DA6C /* cache1d.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DE19F1AC530091588D /* cache1d.c */; }; - 0013829919F361B60007DA6C /* smalltextfont.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90219F1AC540091588D /* smalltextfont.c */; }; - 0013829A19F361B60007DA6C /* polymer.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FA19F1AC540091588D /* polymer.c */; }; - 0013829B19F361B60007DA6C /* mmulti_null.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F619F1AC540091588D /* mmulti_null.c */; }; - 0013829C19F361B60007DA6C /* a-c.c in Sources */ = {isa = PBXBuildFile; fileRef = 00970E3319F207F000873EB9 /* a-c.c */; }; - 0013829D19F361B60007DA6C /* textfont.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90719F1AC540091588D /* textfont.c */; }; - 0013829E19F361B60007DA6C /* mdsprite.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F019F1AC540091588D /* mdsprite.c */; }; - 0013829F19F361B60007DA6C /* defs.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E319F1AC530091588D /* defs.c */; }; - 001382A019F361B60007DA6C /* baselayer.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DC19F1AC530091588D /* baselayer.c */; }; + 000C48F219F35F42006E6B52 /* gamevars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9B619F1AD9B0091588D /* gamevars.cpp */; }; + 0013828B19F361B60007DA6C /* sdlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FF19F1AC540091588D /* sdlayer.cpp */; }; + 0013828C19F361B60007DA6C /* compat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E019F1AC530091588D /* compat.cpp */; }; + 0013828D19F361B60007DA6C /* kplib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8EC19F1AC540091588D /* kplib.cpp */; }; + 0013828E19F361B60007DA6C /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E619F1AC530091588D /* engine.cpp */; }; + 0013828F19F361B60007DA6C /* voxmodel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E91F19F1AC540091588D /* voxmodel.cpp */; }; + 0013829119F361B60007DA6C /* pragmas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FC19F1AC540091588D /* pragmas.cpp */; }; + 0013829219F361B60007DA6C /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DF19F1AC530091588D /* common.cpp */; }; + 0013829319F361B60007DA6C /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F719F1AC540091588D /* mutex.cpp */; }; + 0013829519F361B60007DA6C /* crc32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E219F1AC530091588D /* crc32.cpp */; }; + 0013829719F361B60007DA6C /* texcache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90619F1AC540091588D /* texcache.cpp */; }; + 0013829819F361B60007DA6C /* cache1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DE19F1AC530091588D /* cache1d.cpp */; }; + 0013829919F361B60007DA6C /* smalltextfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90219F1AC540091588D /* smalltextfont.cpp */; }; + 0013829A19F361B60007DA6C /* polymer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FA19F1AC540091588D /* polymer.cpp */; }; + 0013829B19F361B60007DA6C /* mmulti_null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F619F1AC540091588D /* mmulti_null.cpp */; }; + 0013829C19F361B60007DA6C /* a-c.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00970E3319F207F000873EB9 /* a-c.cpp */; }; + 0013829D19F361B60007DA6C /* textfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E90719F1AC540091588D /* textfont.cpp */; }; + 0013829E19F361B60007DA6C /* mdsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F019F1AC540091588D /* mdsprite.cpp */; }; + 0013829F19F361B60007DA6C /* defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E319F1AC530091588D /* defs.cpp */; }; + 001382A019F361B60007DA6C /* baselayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8DC19F1AC530091588D /* baselayer.cpp */; }; 001382A119F361B60007DA6C /* xxhash.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E92219F1AC540091588D /* xxhash.c */; }; - 001382A219F361B60007DA6C /* scriptfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FE19F1AC540091588D /* scriptfile.c */; }; - 001382A319F361B60007DA6C /* polymost.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FB19F1AC540091588D /* polymost.c */; }; - 001382A419F361B60007DA6C /* hightile.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8EB19F1AC540091588D /* hightile.c */; }; - 001382A519F361B60007DA6C /* dxtfilter.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E419F1AC530091588D /* dxtfilter.c */; }; + 001382A219F361B60007DA6C /* scriptfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FE19F1AC540091588D /* scriptfile.cpp */; }; + 001382A319F361B60007DA6C /* polymost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8FB19F1AC540091588D /* polymost.cpp */; }; + 001382A419F361B60007DA6C /* hightile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8EB19F1AC540091588D /* hightile.cpp */; }; + 001382A519F361B60007DA6C /* dxtfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E419F1AC530091588D /* dxtfilter.cpp */; }; 001382A619F361B60007DA6C /* lz4.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8EE19F1AC540091588D /* lz4.c */; }; - 001382A719F361B60007DA6C /* osd.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F819F1AC540091588D /* osd.c */; }; - 001382A819F361B60007DA6C /* glbuild.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E919F1AC540091588D /* glbuild.c */; }; + 001382A719F361B60007DA6C /* osd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8F819F1AC540091588D /* osd.cpp */; }; + 001382A819F361B60007DA6C /* glbuild.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E8E919F1AC540091588D /* glbuild.cpp */; }; 001382AE19F361B60007DA6C /* engine_priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8E819F1AC540091588D /* engine_priv.h */; }; 001382AF19F361B60007DA6C /* crc32.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8A719F1AC530091588D /* crc32.h */; settings = {ATTRIBUTES = (Public, ); }; }; 001382B019F361B60007DA6C /* scancodes.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8C819F1AC530091588D /* scancodes.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -311,13 +310,12 @@ 001382D819F361B60007DA6C /* sdlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8CC19F1AC530091588D /* sdlayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 001382D919F361B60007DA6C /* cache1d.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8A419F1AC530091588D /* cache1d.h */; settings = {ATTRIBUTES = (Public, ); }; }; 001382DA19F361B60007DA6C /* mmulti.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E8B619F1AC530091588D /* mmulti.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 001382E119F361B80007DA6C /* keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72D19F1ABB80091588D /* keyboard.c */; }; - 001382E219F361B80007DA6C /* animlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72519F1ABB80091588D /* animlib.c */; }; - 001382E319F361B80007DA6C /* control.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72719F1ABB80091588D /* control.c */; }; - 001382E419F361B80007DA6C /* scriplib.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E73319F1ABB80091588D /* scriplib.c */; }; - 001382E619F361B80007DA6C /* mouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E73119F1ABB80091588D /* mouse.c */; }; - 001382E719F361B80007DA6C /* file_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72919F1ABB80091588D /* file_lib.c */; }; - 001382E819F361B80007DA6C /* joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72B19F1ABB80091588D /* joystick.c */; }; + 001382E119F361B80007DA6C /* keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72D19F1ABB80091588D /* keyboard.cpp */; }; + 001382E219F361B80007DA6C /* animlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72519F1ABB80091588D /* animlib.cpp */; }; + 001382E319F361B80007DA6C /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72719F1ABB80091588D /* control.cpp */; }; + 001382E419F361B80007DA6C /* scriplib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E73319F1ABB80091588D /* scriplib.cpp */; }; + 001382E719F361B80007DA6C /* file_lib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72919F1ABB80091588D /* file_lib.cpp */; }; + 001382E819F361B80007DA6C /* joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E72B19F1ABB80091588D /* joystick.cpp */; }; 001382EB19F361B80007DA6C /* mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E73219F1ABB80091588D /* mouse.h */; settings = {ATTRIBUTES = (Public, ); }; }; 001382ED19F361B80007DA6C /* joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E72C19F1ABB80091588D /* joystick.h */; settings = {ATTRIBUTES = (Public, ); }; }; 001382EE19F361B80007DA6C /* control.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E72819F1ABB80091588D /* control.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -327,17 +325,17 @@ 001382F219F361B80007DA6C /* _control.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E72319F1ABB80091588D /* _control.h */; }; 001382F319F361B80007DA6C /* animlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E72619F1ABB80091588D /* animlib.h */; settings = {ATTRIBUTES = (Public, ); }; }; 001382F419F361B80007DA6C /* keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E72E19F1ABB80091588D /* keyboard.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 001382FB19F361BB0007DA6C /* fx_man.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DE19F1AAFF0091588D /* fx_man.c */; }; - 001382FC19F361BB0007DA6C /* formats.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DD19F1AAFF0091588D /* formats.c */; }; - 001382FD19F361BB0007DA6C /* flac.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DC19F1AAFF0091588D /* flac.c */; }; - 001382FE19F361BB0007DA6C /* mixst.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E219F1AAFF0091588D /* mixst.c */; }; - 001382FF19F361BB0007DA6C /* xa.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E819F1AAFF0091588D /* xa.c */; }; - 0013830019F361BB0007DA6C /* multivoc.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E319F1AAFF0091588D /* multivoc.c */; }; - 0013830119F361BB0007DA6C /* pitch.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E519F1AAFF0091588D /* pitch.c */; }; - 0013830319F361BB0007DA6C /* mix.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E119F1AAFF0091588D /* mix.c */; }; - 0013830419F361BB0007DA6C /* drivers.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DA19F1AAFF0091588D /* drivers.c */; }; - 0013830519F361BB0007DA6C /* driver_nosound.c in Sources */ = {isa = PBXBuildFile; fileRef = 00970E4E19F2108600873EB9 /* driver_nosound.c */; }; - 0013830619F361BB0007DA6C /* vorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E719F1AAFF0091588D /* vorbis.c */; }; + 001382FB19F361BB0007DA6C /* fx_man.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DE19F1AAFF0091588D /* fx_man.cpp */; }; + 001382FC19F361BB0007DA6C /* formats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DD19F1AAFF0091588D /* formats.cpp */; }; + 001382FD19F361BB0007DA6C /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DC19F1AAFF0091588D /* flac.cpp */; }; + 001382FE19F361BB0007DA6C /* mixst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E219F1AAFF0091588D /* mixst.cpp */; }; + 001382FF19F361BB0007DA6C /* xa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E819F1AAFF0091588D /* xa.cpp */; }; + 0013830019F361BB0007DA6C /* multivoc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E319F1AAFF0091588D /* multivoc.cpp */; }; + 0013830119F361BB0007DA6C /* pitch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E519F1AAFF0091588D /* pitch.cpp */; }; + 0013830319F361BB0007DA6C /* mix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E119F1AAFF0091588D /* mix.cpp */; }; + 0013830419F361BB0007DA6C /* drivers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6DA19F1AAFF0091588D /* drivers.cpp */; }; + 0013830519F361BB0007DA6C /* driver_nosound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00970E4E19F2108600873EB9 /* driver_nosound.cpp */; }; + 0013830619F361BB0007DA6C /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6E719F1AAFF0091588D /* vorbis.cpp */; }; 0013830D19F361BB0007DA6C /* linklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E6DF19F1AAFF0091588D /* linklist.h */; }; 0013830E19F361BB0007DA6C /* music.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E6D019F1AAFE0091588D /* music.h */; settings = {ATTRIBUTES = (Public, ); }; }; 0013831019F361BB0007DA6C /* fx_man.h in Headers */ = {isa = PBXBuildFile; fileRef = 0008E6CF19F1AAFE0091588D /* fx_man.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -369,7 +367,7 @@ 00970E3019F2076B00873EB9 /* libvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00970E2119F2076B00873EB9 /* libvorbisfile.a */; }; 00970E3119F2076B00873EB9 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00970E2219F2076B00873EB9 /* libvpx.a */; }; 00970E3219F2076B00873EB9 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00970E2219F2076B00873EB9 /* libvpx.a */; }; - 00970E3419F207F000873EB9 /* a-c.c in Sources */ = {isa = PBXBuildFile; fileRef = 00970E3319F207F000873EB9 /* a-c.c */; }; + 00970E3419F207F000873EB9 /* a-c.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00970E3319F207F000873EB9 /* a-c.cpp */; }; 00970E4619F20F7E00873EB9 /* libBUILD.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0008E6B719F1A9260091588D /* libBUILD.a */; }; 00970E4719F20F7E00873EB9 /* libMACT.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0008E6C219F1A9AF0091588D /* libMACT.a */; }; 00970E4819F20F7E00873EB9 /* libAudioLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0008E6CA19F1AAA30091588D /* libAudioLib.a */; }; @@ -378,9 +376,9 @@ 00970E4B19F20F7E00873EB9 /* libMACT.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0008E6C219F1A9AF0091588D /* libMACT.a */; }; 00970E4C19F20F7E00873EB9 /* libAudioLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0008E6CA19F1AAA30091588D /* libAudioLib.a */; }; 00970E4D19F20F7E00873EB9 /* libENet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0008EA4919F1B0020091588D /* libENet.a */; }; - 00970E5019F2108600873EB9 /* driver_nosound.c in Sources */ = {isa = PBXBuildFile; fileRef = 00970E4E19F2108600873EB9 /* driver_nosound.c */; }; + 00970E5019F2108600873EB9 /* driver_nosound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00970E4E19F2108600873EB9 /* driver_nosound.cpp */; }; 00970E5119F2108600873EB9 /* driver_nosound.h in Headers */ = {isa = PBXBuildFile; fileRef = 00970E4F19F2108600873EB9 /* driver_nosound.h */; }; - 00970E5219F210C100873EB9 /* rev.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D219F1AD9B0091588D /* rev.c */; }; + 00970E5219F210C100873EB9 /* rev.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9D219F1AD9B0091588D /* rev.cpp */; }; 00970E5819F2128300873EB9 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 00970E5719F2128300873EB9 /* libz.dylib */; }; 00970E5919F2129B00873EB9 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 00970E5719F2128300873EB9 /* libz.dylib */; }; 00970E5B19F2139500873EB9 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00970E5A19F2139500873EB9 /* ForceFeedback.framework */; }; @@ -388,30 +386,30 @@ 00970E5E19F213B300873EB9 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 00970E5D19F213B300873EB9 /* libiconv.dylib */; }; 00970E5F19F2140E00873EB9 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 00970E5D19F213B300873EB9 /* libiconv.dylib */; }; 00970E6119F2142400873EB9 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00970E6019F2142400873EB9 /* CoreAudio.framework */; }; - 00CAC13319F4E0EA00317AE6 /* driver_sdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6D819F1AAFF0091588D /* driver_sdl.c */; }; + 00CAC13319F4E0EA00317AE6 /* driver_sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E6D819F1AAFF0091588D /* driver_sdl.cpp */; }; 00CAC13419F4E12400317AE6 /* libSDL2_mixer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 000C48F019F35DD7006E6B52 /* libSDL2_mixer.a */; }; 00CD003219F374ED00636963 /* duke3d.grp in Resources */ = {isa = PBXBuildFile; fileRef = 00CD003119F374ED00636963 /* duke3d.grp */; }; 2038AE961A8F122D0093B7B2 /* libdivide.h in Headers */ = {isa = PBXBuildFile; fileRef = 2038AE951A8F122D0093B7B2 /* libdivide.h */; }; 2038AE971A8F122D0093B7B2 /* libdivide.h in Headers */ = {isa = PBXBuildFile; fileRef = 2038AE951A8F122D0093B7B2 /* libdivide.h */; }; 2038AE991A8F12590093B7B2 /* md4.h in Headers */ = {isa = PBXBuildFile; fileRef = 2038AE981A8F12590093B7B2 /* md4.h */; }; 2038AE9A1A8F12590093B7B2 /* md4.h in Headers */ = {isa = PBXBuildFile; fileRef = 2038AE981A8F12590093B7B2 /* md4.h */; }; - 2038AE9C1A8F126C0093B7B2 /* md4.c in Sources */ = {isa = PBXBuildFile; fileRef = 2038AE9B1A8F126C0093B7B2 /* md4.c */; }; - 2038AE9D1A8F126C0093B7B2 /* md4.c in Sources */ = {isa = PBXBuildFile; fileRef = 2038AE9B1A8F126C0093B7B2 /* md4.c */; }; - 2038AEA01A8F12B60093B7B2 /* animsounds.c in Sources */ = {isa = PBXBuildFile; fileRef = 2038AE9E1A8F12B60093B7B2 /* animsounds.c */; }; - 2038AEA11A8F12B60093B7B2 /* animsounds.c in Sources */ = {isa = PBXBuildFile; fileRef = 2038AE9E1A8F12B60093B7B2 /* animsounds.c */; }; + 2038AE9C1A8F126C0093B7B2 /* md4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2038AE9B1A8F126C0093B7B2 /* md4.cpp */; }; + 2038AE9D1A8F126C0093B7B2 /* md4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2038AE9B1A8F126C0093B7B2 /* md4.cpp */; }; + 2038AEA01A8F12B60093B7B2 /* animsounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2038AE9E1A8F12B60093B7B2 /* animsounds.cpp */; }; + 2038AEA11A8F12B60093B7B2 /* animsounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2038AE9E1A8F12B60093B7B2 /* animsounds.cpp */; }; 2038AEA31A8F137E0093B7B2 /* DUKE.RTS in Resources */ = {isa = PBXBuildFile; fileRef = 2038AEA21A8F137E0093B7B2 /* DUKE.RTS */; }; 2044C9841E089F2500A8C543 /* palette.h in Headers */ = {isa = PBXBuildFile; fileRef = 2044C9831E089F2500A8C543 /* palette.h */; settings = {ATTRIBUTES = (Public, ); }; }; 2044C9851E089F2500A8C543 /* palette.h in Headers */ = {isa = PBXBuildFile; fileRef = 2044C9831E089F2500A8C543 /* palette.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 2044C98A1E08A66B00A8C543 /* palette.c in Sources */ = {isa = PBXBuildFile; fileRef = 2044C9891E08A66B00A8C543 /* palette.c */; }; - 2044C98B1E08A66B00A8C543 /* palette.c in Sources */ = {isa = PBXBuildFile; fileRef = 2044C9891E08A66B00A8C543 /* palette.c */; }; - 2044C98D1E08A69700A8C543 /* clip.c in Sources */ = {isa = PBXBuildFile; fileRef = 2044C98C1E08A69700A8C543 /* clip.c */; }; - 2044C98E1E08A69700A8C543 /* clip.c in Sources */ = {isa = PBXBuildFile; fileRef = 2044C98C1E08A69700A8C543 /* clip.c */; }; - 2044C9901E08A6BC00A8C543 /* screenshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 2044C98F1E08A6BC00A8C543 /* screenshot.c */; }; - 2044C9911E08A6BC00A8C543 /* screenshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 2044C98F1E08A6BC00A8C543 /* screenshot.c */; }; - 2044C9991E08A72200A8C543 /* mhk.c in Sources */ = {isa = PBXBuildFile; fileRef = 2044C9981E08A72200A8C543 /* mhk.c */; }; - 2044C99A1E08A72200A8C543 /* mhk.c in Sources */ = {isa = PBXBuildFile; fileRef = 2044C9981E08A72200A8C543 /* mhk.c */; }; - 2044C99C1E08A74100A8C543 /* tiles.c in Sources */ = {isa = PBXBuildFile; fileRef = 2044C99B1E08A74100A8C543 /* tiles.c */; }; - 2044C99D1E08A74100A8C543 /* tiles.c in Sources */ = {isa = PBXBuildFile; fileRef = 2044C99B1E08A74100A8C543 /* tiles.c */; }; + 2044C98A1E08A66B00A8C543 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2044C9891E08A66B00A8C543 /* palette.cpp */; }; + 2044C98B1E08A66B00A8C543 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2044C9891E08A66B00A8C543 /* palette.cpp */; }; + 2044C98D1E08A69700A8C543 /* clip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2044C98C1E08A69700A8C543 /* clip.cpp */; }; + 2044C98E1E08A69700A8C543 /* clip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2044C98C1E08A69700A8C543 /* clip.cpp */; }; + 2044C9901E08A6BC00A8C543 /* screenshot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2044C98F1E08A6BC00A8C543 /* screenshot.cpp */; }; + 2044C9911E08A6BC00A8C543 /* screenshot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2044C98F1E08A6BC00A8C543 /* screenshot.cpp */; }; + 2044C9991E08A72200A8C543 /* mhk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2044C9981E08A72200A8C543 /* mhk.cpp */; }; + 2044C99A1E08A72200A8C543 /* mhk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2044C9981E08A72200A8C543 /* mhk.cpp */; }; + 2044C99C1E08A74100A8C543 /* tiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2044C99B1E08A74100A8C543 /* tiles.cpp */; }; + 2044C99D1E08A74100A8C543 /* tiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2044C99B1E08A74100A8C543 /* tiles.cpp */; }; 204D6B5F1C98973F001FA505 /* Math.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 204D6B571C98973F001FA505 /* Math.hpp */; }; 204D6B601C98973F001FA505 /* ProcessCommon.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 204D6B581C98973F001FA505 /* ProcessCommon.hpp */; }; 204D6B611C98973F001FA505 /* ProcessRGB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 204D6B591C98973F001FA505 /* ProcessRGB.cpp */; }; @@ -428,33 +426,33 @@ 20C2146F1B02C1D800917E58 /* build.png in Resources */ = {isa = PBXBuildFile; fileRef = 20C2146E1B02C1D800917E58 /* build.png */; }; 20CA2FA71BB2456E001231BF /* drivers.h in Headers */ = {isa = PBXBuildFile; fileRef = 20CA2FA61BB2456E001231BF /* drivers.h */; }; 20CA2FA81BB2456E001231BF /* drivers.h in Headers */ = {isa = PBXBuildFile; fileRef = 20CA2FA61BB2456E001231BF /* drivers.h */; }; - 20CEFB121E08A86B0077879C /* 2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 20CEFB111E08A86B0077879C /* 2d.c */; }; - 20CEFB131E08A86B0077879C /* 2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 20CEFB111E08A86B0077879C /* 2d.c */; }; - 20CEFB181E08A8830077879C /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 20CEFB171E08A8830077879C /* hash.c */; }; - 20CEFB191E08A8830077879C /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 20CEFB171E08A8830077879C /* hash.c */; }; - 20CEFB1B1E08A8CB0077879C /* xmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 20CEFB1A1E08A8CB0077879C /* xmp.c */; }; - 20CEFB1C1E08A8CB0077879C /* xmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 20CEFB1A1E08A8CB0077879C /* xmp.c */; }; + 20CEFB121E08A86B0077879C /* 2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20CEFB111E08A86B0077879C /* 2d.cpp */; }; + 20CEFB131E08A86B0077879C /* 2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20CEFB111E08A86B0077879C /* 2d.cpp */; }; + 20CEFB181E08A8830077879C /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20CEFB171E08A8830077879C /* hash.cpp */; }; + 20CEFB191E08A8830077879C /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20CEFB171E08A8830077879C /* hash.cpp */; }; + 20CEFB1B1E08A8CB0077879C /* xmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20CEFB1A1E08A8CB0077879C /* xmp.cpp */; }; + 20CEFB1C1E08A8CB0077879C /* xmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20CEFB1A1E08A8CB0077879C /* xmp.cpp */; }; 20CEFB1E1E08A8FD0077879C /* hash.h in Headers */ = {isa = PBXBuildFile; fileRef = 20CEFB1D1E08A8FD0077879C /* hash.h */; }; 20CEFB1F1E08A8FD0077879C /* hash.h in Headers */ = {isa = PBXBuildFile; fileRef = 20CEFB1D1E08A8FD0077879C /* hash.h */; }; 20CEFB211E08A9130077879C /* buildtypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 20CEFB201E08A9130077879C /* buildtypes.h */; }; 20CEFB221E08A9130077879C /* buildtypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 20CEFB201E08A9130077879C /* buildtypes.h */; }; 20CEFB241E08A91D0077879C /* clip.h in Headers */ = {isa = PBXBuildFile; fileRef = 20CEFB231E08A91D0077879C /* clip.h */; }; 20CEFB251E08A91D0077879C /* clip.h in Headers */ = {isa = PBXBuildFile; fileRef = 20CEFB231E08A91D0077879C /* clip.h */; }; - 20E16CE11C7022C300EE8446 /* cmdline.c in Sources */ = {isa = PBXBuildFile; fileRef = 20E16CDF1C7022C300EE8446 /* cmdline.c */; }; - 20E16CE21C7022C300EE8446 /* cmdline.c in Sources */ = {isa = PBXBuildFile; fileRef = 20E16CDF1C7022C300EE8446 /* cmdline.c */; }; - 20E16CE81C7022DE00EE8446 /* screens.c in Sources */ = {isa = PBXBuildFile; fileRef = 20E16CE61C7022DE00EE8446 /* screens.c */; }; - 20E16CE91C7022DE00EE8446 /* screens.c in Sources */ = {isa = PBXBuildFile; fileRef = 20E16CE61C7022DE00EE8446 /* screens.c */; }; + 20E16CE11C7022C300EE8446 /* cmdline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20E16CDF1C7022C300EE8446 /* cmdline.cpp */; }; + 20E16CE21C7022C300EE8446 /* cmdline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20E16CDF1C7022C300EE8446 /* cmdline.cpp */; }; + 20E16CE81C7022DE00EE8446 /* screens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20E16CE61C7022DE00EE8446 /* screens.cpp */; }; + 20E16CE91C7022DE00EE8446 /* screens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20E16CE61C7022DE00EE8446 /* screens.cpp */; }; 20F70F131A8F25CE00F71870 /* libc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0013832819F366720007DA6C /* libc++.dylib */; }; - 20F7124D1C6C19E5006B68D0 /* screentext.c in Sources */ = {isa = PBXBuildFile; fileRef = 20F7124B1C6C19E5006B68D0 /* screentext.c */; }; - 20F7124E1C6C19E5006B68D0 /* screentext.c in Sources */ = {isa = PBXBuildFile; fileRef = 20F7124B1C6C19E5006B68D0 /* screentext.c */; }; - 20F712511C6C19F4006B68D0 /* sbar.c in Sources */ = {isa = PBXBuildFile; fileRef = 20F7124F1C6C19F4006B68D0 /* sbar.c */; }; - 20F712521C6C19F4006B68D0 /* sbar.c in Sources */ = {isa = PBXBuildFile; fileRef = 20F7124F1C6C19F4006B68D0 /* sbar.c */; }; - 20F712551C6C1A07006B68D0 /* cheats.c in Sources */ = {isa = PBXBuildFile; fileRef = 20F712531C6C1A07006B68D0 /* cheats.c */; }; - 20F712561C6C1A07006B68D0 /* cheats.c in Sources */ = {isa = PBXBuildFile; fileRef = 20F712531C6C1A07006B68D0 /* cheats.c */; }; + 20F7124D1C6C19E5006B68D0 /* screentext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F7124B1C6C19E5006B68D0 /* screentext.cpp */; }; + 20F7124E1C6C19E5006B68D0 /* screentext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F7124B1C6C19E5006B68D0 /* screentext.cpp */; }; + 20F712511C6C19F4006B68D0 /* sbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F7124F1C6C19F4006B68D0 /* sbar.cpp */; }; + 20F712521C6C19F4006B68D0 /* sbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F7124F1C6C19F4006B68D0 /* sbar.cpp */; }; + 20F712551C6C1A07006B68D0 /* cheats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F712531C6C1A07006B68D0 /* cheats.cpp */; }; + 20F712561C6C1A07006B68D0 /* cheats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20F712531C6C1A07006B68D0 /* cheats.cpp */; }; 20FD1D481C44E4BE00C2E553 /* colmatch.h in Headers */ = {isa = PBXBuildFile; fileRef = 20FD1D471C44E4BE00C2E553 /* colmatch.h */; }; 20FD1D491C44E4BE00C2E553 /* colmatch.h in Headers */ = {isa = PBXBuildFile; fileRef = 20FD1D471C44E4BE00C2E553 /* colmatch.h */; }; - 20FD1D511C44E4E700C2E553 /* colmatch.c in Sources */ = {isa = PBXBuildFile; fileRef = 20FD1D501C44E4E700C2E553 /* colmatch.c */; }; - 20FD1D521C44E4E700C2E553 /* colmatch.c in Sources */ = {isa = PBXBuildFile; fileRef = 20FD1D501C44E4E700C2E553 /* colmatch.c */; }; + 20FD1D511C44E4E700C2E553 /* colmatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20FD1D501C44E4E700C2E553 /* colmatch.cpp */; }; + 20FD1D521C44E4E700C2E553 /* colmatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20FD1D501C44E4E700C2E553 /* colmatch.cpp */; }; 20FD1D6B1C44E64700C2E553 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20FD1D6A1C44E64700C2E553 /* GameController.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; /* End PBXBuildFile section */ @@ -548,193 +546,192 @@ 0008E6B719F1A9260091588D /* libBUILD.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libBUILD.a; sourceTree = BUILT_PRODUCTS_DIR; }; 0008E6C219F1A9AF0091588D /* libMACT.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMACT.a; sourceTree = BUILT_PRODUCTS_DIR; }; 0008E6CA19F1AAA30091588D /* libAudioLib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAudioLib.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 0008E6CF19F1AAFE0091588D /* fx_man.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fx_man.h; path = ../../source/jaudiolib/include/fx_man.h; sourceTree = SOURCE_ROOT; }; - 0008E6D019F1AAFE0091588D /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music.h; path = ../../source/jaudiolib/include/music.h; sourceTree = SOURCE_ROOT; }; - 0008E6D319F1AAFE0091588D /* _multivc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = _multivc.h; path = ../../source/jaudiolib/src/_multivc.h; sourceTree = SOURCE_ROOT; }; - 0008E6D819F1AAFF0091588D /* driver_sdl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = driver_sdl.c; path = ../../source/jaudiolib/src/driver_sdl.c; sourceTree = SOURCE_ROOT; }; - 0008E6D919F1AAFF0091588D /* driver_sdl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = driver_sdl.h; path = ../../source/jaudiolib/src/driver_sdl.h; sourceTree = SOURCE_ROOT; }; - 0008E6DA19F1AAFF0091588D /* drivers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = drivers.c; path = ../../source/jaudiolib/src/drivers.c; sourceTree = SOURCE_ROOT; }; - 0008E6DC19F1AAFF0091588D /* flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = flac.c; path = ../../source/jaudiolib/src/flac.c; sourceTree = SOURCE_ROOT; }; - 0008E6DD19F1AAFF0091588D /* formats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = formats.c; path = ../../source/jaudiolib/src/formats.c; sourceTree = SOURCE_ROOT; }; - 0008E6DE19F1AAFF0091588D /* fx_man.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fx_man.c; path = ../../source/jaudiolib/src/fx_man.c; sourceTree = SOURCE_ROOT; }; - 0008E6DF19F1AAFF0091588D /* linklist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = linklist.h; path = ../../source/jaudiolib/src/linklist.h; sourceTree = SOURCE_ROOT; }; - 0008E6E119F1AAFF0091588D /* mix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mix.c; path = ../../source/jaudiolib/src/mix.c; sourceTree = SOURCE_ROOT; }; - 0008E6E219F1AAFF0091588D /* mixst.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mixst.c; path = ../../source/jaudiolib/src/mixst.c; sourceTree = SOURCE_ROOT; }; - 0008E6E319F1AAFF0091588D /* multivoc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = multivoc.c; path = ../../source/jaudiolib/src/multivoc.c; sourceTree = SOURCE_ROOT; }; - 0008E6E419F1AAFF0091588D /* multivoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = multivoc.h; path = ../../source/jaudiolib/include/multivoc.h; sourceTree = SOURCE_ROOT; }; - 0008E6E519F1AAFF0091588D /* pitch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pitch.c; path = ../../source/jaudiolib/src/pitch.c; sourceTree = SOURCE_ROOT; }; - 0008E6E619F1AAFF0091588D /* pitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pitch.h; path = ../../source/jaudiolib/src/pitch.h; sourceTree = SOURCE_ROOT; }; - 0008E6E719F1AAFF0091588D /* vorbis.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vorbis.c; path = ../../source/jaudiolib/src/vorbis.c; sourceTree = SOURCE_ROOT; }; - 0008E6E819F1AAFF0091588D /* xa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xa.c; path = ../../source/jaudiolib/src/xa.c; sourceTree = SOURCE_ROOT; }; - 0008E72319F1ABB80091588D /* _control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = _control.h; path = ../../source/jmact/_control.h; sourceTree = SOURCE_ROOT; }; - 0008E72419F1ABB80091588D /* _scrplib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = _scrplib.h; path = ../../source/jmact/_scrplib.h; sourceTree = SOURCE_ROOT; }; - 0008E72519F1ABB80091588D /* animlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = animlib.c; path = ../../source/jmact/animlib.c; sourceTree = SOURCE_ROOT; }; - 0008E72619F1ABB80091588D /* animlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = animlib.h; path = ../../source/jmact/animlib.h; sourceTree = SOURCE_ROOT; }; - 0008E72719F1ABB80091588D /* control.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = control.c; path = ../../source/jmact/control.c; sourceTree = SOURCE_ROOT; }; - 0008E72819F1ABB80091588D /* control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = control.h; path = ../../source/jmact/control.h; sourceTree = SOURCE_ROOT; }; - 0008E72919F1ABB80091588D /* file_lib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = file_lib.c; path = ../../source/jmact/file_lib.c; sourceTree = SOURCE_ROOT; }; - 0008E72A19F1ABB80091588D /* file_lib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = file_lib.h; path = ../../source/jmact/file_lib.h; sourceTree = SOURCE_ROOT; }; - 0008E72B19F1ABB80091588D /* joystick.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = joystick.c; path = ../../source/jmact/joystick.c; sourceTree = SOURCE_ROOT; }; - 0008E72C19F1ABB80091588D /* joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = joystick.h; path = ../../source/jmact/joystick.h; sourceTree = SOURCE_ROOT; }; - 0008E72D19F1ABB80091588D /* keyboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = keyboard.c; path = ../../source/jmact/keyboard.c; sourceTree = SOURCE_ROOT; }; - 0008E72E19F1ABB80091588D /* keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keyboard.h; path = ../../source/jmact/keyboard.h; sourceTree = SOURCE_ROOT; }; - 0008E73119F1ABB80091588D /* mouse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mouse.c; path = ../../source/jmact/mouse.c; sourceTree = SOURCE_ROOT; }; - 0008E73219F1ABB80091588D /* mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mouse.h; path = ../../source/jmact/mouse.h; sourceTree = SOURCE_ROOT; }; - 0008E73319F1ABB80091588D /* scriplib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = scriplib.c; path = ../../source/jmact/scriplib.c; sourceTree = SOURCE_ROOT; }; - 0008E73419F1ABB80091588D /* scriplib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scriplib.h; path = ../../source/jmact/scriplib.h; sourceTree = SOURCE_ROOT; }; - 0008E8A119F1AC530091588D /* a.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = a.h; path = ../../build/include/a.h; sourceTree = SOURCE_ROOT; }; - 0008E8A219F1AC530091588D /* baselayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = baselayer.h; path = ../../build/include/baselayer.h; sourceTree = SOURCE_ROOT; }; - 0008E8A319F1AC530091588D /* build.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = build.h; path = ../../build/include/build.h; sourceTree = SOURCE_ROOT; }; - 0008E8A419F1AC530091588D /* cache1d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cache1d.h; path = ../../build/include/cache1d.h; sourceTree = SOURCE_ROOT; }; - 0008E8A519F1AC530091588D /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = common.h; path = ../../build/include/common.h; sourceTree = SOURCE_ROOT; }; - 0008E8A619F1AC530091588D /* compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = compat.h; path = ../../build/include/compat.h; sourceTree = SOURCE_ROOT; }; - 0008E8A719F1AC530091588D /* crc32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crc32.h; path = ../../build/include/crc32.h; sourceTree = SOURCE_ROOT; }; - 0008E8A819F1AC530091588D /* dxdidf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dxdidf.h; path = ../../build/include/dxdidf.h; sourceTree = SOURCE_ROOT; }; - 0008E8A919F1AC530091588D /* dxtfilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dxtfilter.h; path = ../../build/include/dxtfilter.h; sourceTree = SOURCE_ROOT; }; - 0008E8AB19F1AC530091588D /* editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = editor.h; path = ../../build/include/editor.h; sourceTree = SOURCE_ROOT; }; - 0008E8AC19F1AC530091588D /* glbuild.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glbuild.h; path = ../../build/include/glbuild.h; sourceTree = SOURCE_ROOT; }; - 0008E8AD19F1AC530091588D /* glext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glext.h; path = ../../build/include/glext.h; sourceTree = SOURCE_ROOT; }; - 0008E8AF19F1AC530091588D /* hightile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hightile.h; path = ../../build/include/hightile.h; sourceTree = SOURCE_ROOT; }; - 0008E8B019F1AC530091588D /* kplib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kplib.h; path = ../../build/include/kplib.h; sourceTree = SOURCE_ROOT; }; - 0008E8B219F1AC530091588D /* lz4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lz4.h; path = ../../build/include/lz4.h; sourceTree = SOURCE_ROOT; }; - 0008E8B419F1AC530091588D /* m32script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = m32script.h; path = ../../build/include/m32script.h; sourceTree = SOURCE_ROOT; }; - 0008E8B519F1AC530091588D /* mdsprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mdsprite.h; path = ../../build/include/mdsprite.h; sourceTree = SOURCE_ROOT; }; - 0008E8B619F1AC530091588D /* mmulti.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mmulti.h; path = ../../build/include/mmulti.h; sourceTree = SOURCE_ROOT; }; - 0008E8BA19F1AC530091588D /* mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mutex.h; path = ../../build/include/mutex.h; sourceTree = SOURCE_ROOT; }; - 0008E8BB19F1AC530091588D /* osd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = osd.h; path = ../../build/include/osd.h; sourceTree = SOURCE_ROOT; }; - 0008E8BC19F1AC530091588D /* osxbits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = osxbits.h; path = ../../build/include/osxbits.h; sourceTree = SOURCE_ROOT; }; - 0008E8BE19F1AC530091588D /* polymer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = polymer.h; path = ../../build/include/polymer.h; sourceTree = SOURCE_ROOT; }; - 0008E8BF19F1AC530091588D /* polymost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = polymost.h; path = ../../build/include/polymost.h; sourceTree = SOURCE_ROOT; }; - 0008E8C019F1AC530091588D /* pragmas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pragmas.h; path = ../../build/include/pragmas.h; sourceTree = SOURCE_ROOT; }; - 0008E8C119F1AC530091588D /* pragmas_arm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pragmas_arm.h; path = ../../build/include/pragmas_arm.h; sourceTree = SOURCE_ROOT; }; - 0008E8C219F1AC530091588D /* pragmas_ppc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pragmas_ppc.h; path = ../../build/include/pragmas_ppc.h; sourceTree = SOURCE_ROOT; }; - 0008E8C319F1AC530091588D /* pragmas_x86_gcc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pragmas_x86_gcc.h; path = ../../build/include/pragmas_x86_gcc.h; sourceTree = SOURCE_ROOT; }; - 0008E8C519F1AC530091588D /* prlights.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prlights.h; path = ../../build/include/prlights.h; sourceTree = SOURCE_ROOT; }; - 0008E8C619F1AC530091588D /* rawinput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rawinput.h; path = ../../build/include/rawinput.h; sourceTree = SOURCE_ROOT; }; - 0008E8C719F1AC530091588D /* renderlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = renderlayer.h; path = ../../build/include/renderlayer.h; sourceTree = SOURCE_ROOT; }; - 0008E8C819F1AC530091588D /* scancodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scancodes.h; path = ../../build/include/scancodes.h; sourceTree = SOURCE_ROOT; }; - 0008E8C919F1AC530091588D /* scriptfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scriptfile.h; path = ../../build/include/scriptfile.h; sourceTree = SOURCE_ROOT; }; - 0008E8CA19F1AC530091588D /* sdl_inc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sdl_inc.h; path = ../../build/include/sdl_inc.h; sourceTree = SOURCE_ROOT; }; - 0008E8CB19F1AC530091588D /* sdlappicon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sdlappicon.h; path = ../../build/include/sdlappicon.h; sourceTree = SOURCE_ROOT; }; - 0008E8CC19F1AC530091588D /* sdlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sdlayer.h; path = ../../build/include/sdlayer.h; sourceTree = SOURCE_ROOT; }; - 0008E8CF19F1AC530091588D /* texcache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = texcache.h; path = ../../build/include/texcache.h; sourceTree = SOURCE_ROOT; }; - 0008E8D019F1AC530091588D /* tracker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = tracker.hpp; path = ../../build/include/tracker.hpp; sourceTree = SOURCE_ROOT; }; - 0008E8D119F1AC530091588D /* tracker_operator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = tracker_operator.hpp; path = ../../build/include/tracker_operator.hpp; sourceTree = SOURCE_ROOT; }; - 0008E8D219F1AC530091588D /* tracker_operators.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = tracker_operators.hpp; path = ../../build/include/tracker_operators.hpp; sourceTree = SOURCE_ROOT; }; - 0008E8D519F1AC530091588D /* xxhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xxhash.h; path = ../../build/include/xxhash.h; sourceTree = SOURCE_ROOT; }; - 0008E8DC19F1AC530091588D /* baselayer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = baselayer.c; path = ../../build/src/baselayer.c; sourceTree = SOURCE_ROOT; }; - 0008E8DD19F1AC530091588D /* build.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = build.c; path = ../../build/src/build.c; sourceTree = SOURCE_ROOT; }; - 0008E8DE19F1AC530091588D /* cache1d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cache1d.c; path = ../../build/src/cache1d.c; sourceTree = SOURCE_ROOT; }; - 0008E8DF19F1AC530091588D /* common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = common.c; path = ../../build/src/common.c; sourceTree = SOURCE_ROOT; }; - 0008E8E019F1AC530091588D /* compat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = compat.c; path = ../../build/src/compat.c; sourceTree = SOURCE_ROOT; }; - 0008E8E119F1AC530091588D /* config.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = config.c; path = ../../build/src/config.c; sourceTree = SOURCE_ROOT; }; - 0008E8E219F1AC530091588D /* crc32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = crc32.c; path = ../../build/src/crc32.c; sourceTree = SOURCE_ROOT; }; - 0008E8E319F1AC530091588D /* defs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = defs.c; path = ../../build/src/defs.c; sourceTree = SOURCE_ROOT; }; - 0008E8E419F1AC530091588D /* dxtfilter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dxtfilter.c; path = ../../build/src/dxtfilter.c; sourceTree = SOURCE_ROOT; }; - 0008E8E619F1AC530091588D /* engine.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = engine.c; path = ../../build/src/engine.c; sourceTree = SOURCE_ROOT; }; - 0008E8E719F1AC540091588D /* engine_oldmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = engine_oldmap.h; path = ../../build/src/engine_oldmap.h; sourceTree = SOURCE_ROOT; }; - 0008E8E819F1AC540091588D /* engine_priv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = engine_priv.h; path = ../../build/src/engine_priv.h; sourceTree = SOURCE_ROOT; }; - 0008E8E919F1AC540091588D /* glbuild.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = glbuild.c; path = ../../build/src/glbuild.c; sourceTree = SOURCE_ROOT; }; - 0008E8EB19F1AC540091588D /* hightile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hightile.c; path = ../../build/src/hightile.c; sourceTree = SOURCE_ROOT; }; - 0008E8EC19F1AC540091588D /* kplib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = kplib.c; path = ../../build/src/kplib.c; sourceTree = SOURCE_ROOT; }; - 0008E8EE19F1AC540091588D /* lz4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lz4.c; path = ../../build/src/lz4.c; sourceTree = SOURCE_ROOT; }; - 0008E8F019F1AC540091588D /* mdsprite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mdsprite.c; path = ../../build/src/mdsprite.c; sourceTree = SOURCE_ROOT; }; - 0008E8F619F1AC540091588D /* mmulti_null.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mmulti_null.c; path = ../../build/src/mmulti_null.c; sourceTree = SOURCE_ROOT; }; - 0008E8F719F1AC540091588D /* mutex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mutex.c; path = ../../build/src/mutex.c; sourceTree = SOURCE_ROOT; }; - 0008E8F819F1AC540091588D /* osd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = osd.c; path = ../../build/src/osd.c; sourceTree = SOURCE_ROOT; }; - 0008E8F919F1AC540091588D /* osxbits.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = osxbits.m; path = ../../build/src/osxbits.m; sourceTree = SOURCE_ROOT; }; - 0008E8FA19F1AC540091588D /* polymer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = polymer.c; path = ../../build/src/polymer.c; sourceTree = SOURCE_ROOT; }; - 0008E8FB19F1AC540091588D /* polymost.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = polymost.c; path = ../../build/src/polymost.c; sourceTree = SOURCE_ROOT; }; - 0008E8FC19F1AC540091588D /* pragmas.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pragmas.c; path = ../../build/src/pragmas.c; sourceTree = SOURCE_ROOT; }; - 0008E8FE19F1AC540091588D /* scriptfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = scriptfile.c; path = ../../build/src/scriptfile.c; sourceTree = SOURCE_ROOT; }; - 0008E8FF19F1AC540091588D /* sdlayer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sdlayer.c; path = ../../build/src/sdlayer.c; sourceTree = SOURCE_ROOT; }; - 0008E90019F1AC540091588D /* sdlkeytrans.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sdlkeytrans.c; path = ../../build/src/sdlkeytrans.c; sourceTree = SOURCE_ROOT; }; - 0008E90219F1AC540091588D /* smalltextfont.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = smalltextfont.c; path = ../../build/src/smalltextfont.c; sourceTree = SOURCE_ROOT; }; - 0008E90419F1AC540091588D /* startosx.editor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = startosx.editor.m; path = ../../build/src/startosx.editor.m; sourceTree = SOURCE_ROOT; }; - 0008E90619F1AC540091588D /* texcache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = texcache.c; path = ../../build/src/texcache.c; sourceTree = SOURCE_ROOT; }; - 0008E90719F1AC540091588D /* textfont.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = textfont.c; path = ../../build/src/textfont.c; sourceTree = SOURCE_ROOT; }; - 0008E91F19F1AC540091588D /* voxmodel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = voxmodel.c; path = ../../build/src/voxmodel.c; sourceTree = SOURCE_ROOT; }; - 0008E92219F1AC540091588D /* xxhash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xxhash.c; path = ../../build/src/xxhash.c; sourceTree = SOURCE_ROOT; }; - 0008E99919F1AD9B0091588D /* _functio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = _functio.h; path = ../../source/_functio.h; sourceTree = SOURCE_ROOT; }; - 0008E99A19F1AD9B0091588D /* _midi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = _midi.h; path = ../../source/_midi.h; sourceTree = SOURCE_ROOT; }; - 0008E99B19F1AD9B0091588D /* _rts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = _rts.h; path = ../../source/_rts.h; sourceTree = SOURCE_ROOT; }; - 0008E99E19F1AD9B0091588D /* actors.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = actors.c; path = ../../source/actors.c; sourceTree = SOURCE_ROOT; }; - 0008E99F19F1AD9B0091588D /* actors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = actors.h; path = ../../source/actors.h; sourceTree = SOURCE_ROOT; }; - 0008E9A019F1AD9B0091588D /* anim.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = anim.c; path = ../../source/anim.c; sourceTree = SOURCE_ROOT; }; - 0008E9A119F1AD9B0091588D /* anim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = anim.h; path = ../../source/anim.h; sourceTree = SOURCE_ROOT; }; - 0008E9A219F1AD9B0091588D /* animvpx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = animvpx.c; path = ../../source/animvpx.c; sourceTree = SOURCE_ROOT; }; - 0008E9A319F1AD9B0091588D /* animvpx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = animvpx.h; path = ../../source/animvpx.h; sourceTree = SOURCE_ROOT; }; - 0008E9A419F1AD9B0091588D /* config.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = config.c; path = ../../source/config.c; sourceTree = SOURCE_ROOT; }; - 0008E9A519F1AD9B0091588D /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../../source/config.h; sourceTree = SOURCE_ROOT; }; - 0008E9A619F1AD9B0091588D /* demo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = demo.c; path = ../../source/demo.c; sourceTree = SOURCE_ROOT; }; - 0008E9A719F1AD9B0091588D /* demo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = demo.h; path = ../../source/demo.h; sourceTree = SOURCE_ROOT; }; - 0008E9A819F1AD9B0091588D /* duke3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = duke3d.h; path = ../../source/duke3d.h; sourceTree = SOURCE_ROOT; }; - 0008E9A919F1AD9B0091588D /* function.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = function.h; path = ../../source/function.h; sourceTree = SOURCE_ROOT; }; - 0008E9AC19F1AD9B0091588D /* game.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = game.c; path = ../../source/game.c; sourceTree = SOURCE_ROOT; }; - 0008E9AD19F1AD9B0091588D /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = game.h; path = ../../source/game.h; sourceTree = SOURCE_ROOT; }; - 0008E9AE19F1AD9B0091588D /* gamedef.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gamedef.c; path = ../../source/gamedef.c; sourceTree = SOURCE_ROOT; }; - 0008E9AF19F1AD9B0091588D /* gamedef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gamedef.h; path = ../../source/gamedef.h; sourceTree = SOURCE_ROOT; }; - 0008E9B019F1AD9B0091588D /* gamedefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gamedefs.h; path = ../../source/gamedefs.h; sourceTree = SOURCE_ROOT; }; - 0008E9B119F1AD9B0091588D /* gameexec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gameexec.c; path = ../../source/gameexec.c; sourceTree = SOURCE_ROOT; }; - 0008E9B219F1AD9B0091588D /* gameexec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gameexec.h; path = ../../source/gameexec.h; sourceTree = SOURCE_ROOT; }; - 0008E9B319F1AD9B0091588D /* GameListSource.game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GameListSource.game.h; path = ../../source/GameListSource.game.h; sourceTree = SOURCE_ROOT; }; - 0008E9B419F1AD9B0091588D /* GameListSource.game.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GameListSource.game.m; path = ../../source/GameListSource.game.m; sourceTree = SOURCE_ROOT; }; - 0008E9B519F1AD9B0091588D /* gamestructures.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gamestructures.c; path = ../../source/gamestructures.c; sourceTree = SOURCE_ROOT; }; - 0008E9B619F1AD9B0091588D /* gamevars.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gamevars.c; path = ../../source/gamevars.c; sourceTree = SOURCE_ROOT; }; - 0008E9B719F1AD9B0091588D /* gamevars.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gamevars.h; path = ../../source/gamevars.h; sourceTree = SOURCE_ROOT; }; - 0008E9B819F1AD9B0091588D /* global.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = global.c; path = ../../source/global.c; sourceTree = SOURCE_ROOT; }; - 0008E9B919F1AD9B0091588D /* global.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = global.h; path = ../../source/global.h; sourceTree = SOURCE_ROOT; }; - 0008E9BA19F1AD9B0091588D /* GrpFile.game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GrpFile.game.h; path = ../../source/GrpFile.game.h; sourceTree = SOURCE_ROOT; }; - 0008E9BB19F1AD9B0091588D /* GrpFile.game.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GrpFile.game.m; path = ../../source/GrpFile.game.m; sourceTree = SOURCE_ROOT; }; - 0008E9BC19F1AD9B0091588D /* grpscan.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = grpscan.c; path = ../../source/grpscan.c; sourceTree = SOURCE_ROOT; }; - 0008E9BD19F1AD9B0091588D /* grpscan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = grpscan.h; path = ../../source/grpscan.h; sourceTree = SOURCE_ROOT; }; - 0008E9BE19F1AD9B0091588D /* input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = input.c; path = ../../source/input.c; sourceTree = SOURCE_ROOT; }; - 0008E9BF19F1AD9B0091588D /* input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = input.h; path = ../../source/input.h; sourceTree = SOURCE_ROOT; }; - 0008E9C019F1AD9B0091588D /* keys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keys.h; path = ../../source/keys.h; sourceTree = SOURCE_ROOT; }; - 0008E9C119F1AD9B0091588D /* macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = macros.h; path = ../../source/macros.h; sourceTree = SOURCE_ROOT; }; - 0008E9C219F1AD9B0091588D /* menus.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = menus.c; path = ../../source/menus.c; sourceTree = SOURCE_ROOT; }; - 0008E9C319F1AD9B0091588D /* menus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = menus.h; path = ../../source/menus.h; sourceTree = SOURCE_ROOT; }; - 0008E9C419F1AD9B0091588D /* names.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = names.h; path = ../../source/names.h; sourceTree = SOURCE_ROOT; }; - 0008E9C519F1AD9B0091588D /* namesdyn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = namesdyn.c; path = ../../source/namesdyn.c; sourceTree = SOURCE_ROOT; }; - 0008E9C619F1AD9B0091588D /* namesdyn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = namesdyn.h; path = ../../source/namesdyn.h; sourceTree = SOURCE_ROOT; }; - 0008E9C719F1AD9B0091588D /* net.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = net.c; path = ../../source/net.c; sourceTree = SOURCE_ROOT; }; - 0008E9C819F1AD9B0091588D /* net.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = net.h; path = ../../source/net.h; sourceTree = SOURCE_ROOT; }; - 0008E9C919F1AD9B0091588D /* osdcmds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = osdcmds.c; path = ../../source/osdcmds.c; sourceTree = SOURCE_ROOT; }; - 0008E9CA19F1AD9B0091588D /* osdcmds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = osdcmds.h; path = ../../source/osdcmds.h; sourceTree = SOURCE_ROOT; }; - 0008E9CB19F1AD9B0091588D /* osdfuncs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = osdfuncs.c; path = ../../source/osdfuncs.c; sourceTree = SOURCE_ROOT; }; - 0008E9CC19F1AD9B0091588D /* osdfuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = osdfuncs.h; path = ../../source/osdfuncs.h; sourceTree = SOURCE_ROOT; }; - 0008E9CD19F1AD9B0091588D /* player.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = player.c; path = ../../source/player.c; sourceTree = SOURCE_ROOT; }; - 0008E9CE19F1AD9B0091588D /* player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = player.h; path = ../../source/player.h; sourceTree = SOURCE_ROOT; }; - 0008E9CF19F1AD9B0091588D /* premap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = premap.c; path = ../../source/premap.c; sourceTree = SOURCE_ROOT; }; - 0008E9D019F1AD9B0091588D /* premap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = premap.h; path = ../../source/premap.h; sourceTree = SOURCE_ROOT; }; - 0008E9D119F1AD9B0091588D /* quotes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = quotes.h; path = ../../source/quotes.h; sourceTree = SOURCE_ROOT; }; - 0008E9D219F1AD9B0091588D /* rev.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rev.c; path = ../../source/rev.c; sourceTree = SOURCE_ROOT; }; - 0008E9D319F1AD9B0091588D /* rts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rts.c; path = ../../source/rts.c; sourceTree = SOURCE_ROOT; }; - 0008E9D419F1AD9B0091588D /* rts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rts.h; path = ../../source/rts.h; sourceTree = SOURCE_ROOT; }; - 0008E9D519F1AD9B0091588D /* savegame.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = savegame.c; path = ../../source/savegame.c; sourceTree = SOURCE_ROOT; }; - 0008E9D619F1AD9B0091588D /* savegame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = savegame.h; path = ../../source/savegame.h; sourceTree = SOURCE_ROOT; }; - 0008E9D719F1AD9B0091588D /* sdlmusic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sdlmusic.c; path = ../../source/sdlmusic.c; sourceTree = SOURCE_ROOT; }; - 0008E9DA19F1AD9B0091588D /* sector.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sector.c; path = ../../source/sector.c; sourceTree = SOURCE_ROOT; }; - 0008E9DB19F1AD9B0091588D /* sector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sector.h; path = ../../source/sector.h; sourceTree = SOURCE_ROOT; }; - 0008E9DC19F1AD9B0091588D /* soundefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = soundefs.h; path = ../../source/soundefs.h; sourceTree = SOURCE_ROOT; }; - 0008E9DD19F1AD9B0091588D /* sounds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sounds.c; path = ../../source/sounds.c; sourceTree = SOURCE_ROOT; }; - 0008E9DE19F1AD9B0091588D /* sounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sounds.h; path = ../../source/sounds.h; sourceTree = SOURCE_ROOT; }; - 0008E9DF19F1AD9B0091588D /* soundsdyn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = soundsdyn.c; path = ../../source/soundsdyn.c; sourceTree = SOURCE_ROOT; }; - 0008E9E019F1AD9B0091588D /* soundsdyn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = soundsdyn.h; path = ../../source/soundsdyn.h; sourceTree = SOURCE_ROOT; }; - 0008E9E119F1AD9B0091588D /* standard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = standard.h; path = ../../source/standard.h; sourceTree = SOURCE_ROOT; }; - 0008E9E219F1AD9B0091588D /* startosx.game.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = startosx.game.m; path = ../../source/startosx.game.m; sourceTree = SOURCE_ROOT; }; - 0008EA0419F1ADC90091588D /* common_game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = common_game.h; path = ../../source/common_game.h; sourceTree = SOURCE_ROOT; }; - 0008EA0519F1ADC90091588D /* common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = common.c; path = ../../source/common.c; sourceTree = SOURCE_ROOT; }; - 0008EA0619F1ADC90091588D /* sounds_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sounds_common.h; path = ../../source/sounds_common.h; sourceTree = SOURCE_ROOT; }; - 0008EA0D19F1AE820091588D /* astub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = astub.c; path = ../../source/astub.c; sourceTree = SOURCE_ROOT; }; - 0008EA0E19F1AE820091588D /* m32common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = m32common.c; path = ../../source/m32common.c; sourceTree = SOURCE_ROOT; }; - 0008EA0F19F1AE820091588D /* m32def.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = m32def.c; path = ../../source/m32def.c; sourceTree = SOURCE_ROOT; }; - 0008EA1019F1AE820091588D /* m32def.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = m32def.h; path = ../../source/m32def.h; sourceTree = SOURCE_ROOT; }; - 0008EA1119F1AE820091588D /* m32exec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = m32exec.c; path = ../../source/m32exec.c; sourceTree = SOURCE_ROOT; }; - 0008EA1219F1AE820091588D /* m32structures.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = m32structures.c; path = ../../source/m32structures.c; sourceTree = SOURCE_ROOT; }; - 0008EA1319F1AE820091588D /* m32vars.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = m32vars.c; path = ../../source/m32vars.c; sourceTree = SOURCE_ROOT; }; - 0008EA1419F1AE820091588D /* sounds_mapster32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sounds_mapster32.c; path = ../../source/sounds_mapster32.c; sourceTree = SOURCE_ROOT; }; - 0008EA1519F1AE820091588D /* sounds_mapster32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sounds_mapster32.h; path = ../../source/sounds_mapster32.h; sourceTree = SOURCE_ROOT; }; + 0008E6CF19F1AAFE0091588D /* fx_man.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = fx_man.h; path = ../../source/audiolib/include/fx_man.h; sourceTree = SOURCE_ROOT; }; + 0008E6D019F1AAFE0091588D /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = music.h; path = ../../source/audiolib/include/music.h; sourceTree = SOURCE_ROOT; }; + 0008E6D319F1AAFE0091588D /* _multivc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = _multivc.h; path = ../../source/audiolib/src/_multivc.h; sourceTree = SOURCE_ROOT; }; + 0008E6D819F1AAFF0091588D /* driver_sdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = driver_sdl.cpp; path = ../../source/audiolib/src/driver_sdl.cpp; sourceTree = SOURCE_ROOT; }; + 0008E6D919F1AAFF0091588D /* driver_sdl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = driver_sdl.h; path = ../../source/audiolib/src/driver_sdl.h; sourceTree = SOURCE_ROOT; }; + 0008E6DA19F1AAFF0091588D /* drivers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = drivers.cpp; path = ../../source/audiolib/src/drivers.cpp; sourceTree = SOURCE_ROOT; }; + 0008E6DC19F1AAFF0091588D /* flac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = flac.cpp; path = ../../source/audiolib/src/flac.cpp; sourceTree = SOURCE_ROOT; }; + 0008E6DD19F1AAFF0091588D /* formats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = formats.cpp; path = ../../source/audiolib/src/formats.cpp; sourceTree = SOURCE_ROOT; }; + 0008E6DE19F1AAFF0091588D /* fx_man.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = fx_man.cpp; path = ../../source/audiolib/src/fx_man.cpp; sourceTree = SOURCE_ROOT; }; + 0008E6DF19F1AAFF0091588D /* linklist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = linklist.h; path = ../../source/audiolib/src/linklist.h; sourceTree = SOURCE_ROOT; }; + 0008E6E119F1AAFF0091588D /* mix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = mix.cpp; path = ../../source/audiolib/src/mix.cpp; sourceTree = SOURCE_ROOT; }; + 0008E6E219F1AAFF0091588D /* mixst.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = mixst.cpp; path = ../../source/audiolib/src/mixst.cpp; sourceTree = SOURCE_ROOT; }; + 0008E6E319F1AAFF0091588D /* multivoc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = multivoc.cpp; path = ../../source/audiolib/src/multivoc.cpp; sourceTree = SOURCE_ROOT; }; + 0008E6E419F1AAFF0091588D /* multivoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = multivoc.h; path = ../../source/audiolib/include/multivoc.h; sourceTree = SOURCE_ROOT; }; + 0008E6E519F1AAFF0091588D /* pitch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = pitch.cpp; path = ../../source/audiolib/src/pitch.cpp; sourceTree = SOURCE_ROOT; }; + 0008E6E619F1AAFF0091588D /* pitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = pitch.h; path = ../../source/audiolib/src/pitch.h; sourceTree = SOURCE_ROOT; }; + 0008E6E719F1AAFF0091588D /* vorbis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = vorbis.cpp; path = ../../source/audiolib/src/vorbis.cpp; sourceTree = SOURCE_ROOT; }; + 0008E6E819F1AAFF0091588D /* xa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = xa.cpp; path = ../../source/audiolib/src/xa.cpp; sourceTree = SOURCE_ROOT; }; + 0008E72319F1ABB80091588D /* _control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = _control.h; path = ../../source/mact/include/_control.h; sourceTree = SOURCE_ROOT; }; + 0008E72419F1ABB80091588D /* _scrplib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = _scrplib.h; path = ../../source/mact/src/_scrplib.h; sourceTree = SOURCE_ROOT; }; + 0008E72519F1ABB80091588D /* animlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = animlib.cpp; path = ../../source/mact/src/animlib.cpp; sourceTree = SOURCE_ROOT; }; + 0008E72619F1ABB80091588D /* animlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = animlib.h; path = ../../source/mact/include/animlib.h; sourceTree = SOURCE_ROOT; }; + 0008E72719F1ABB80091588D /* control.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = control.cpp; path = ../../source/mact/src/control.cpp; sourceTree = SOURCE_ROOT; }; + 0008E72819F1ABB80091588D /* control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = control.h; path = ../../source/mact/include/control.h; sourceTree = SOURCE_ROOT; }; + 0008E72919F1ABB80091588D /* file_lib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = file_lib.cpp; path = ../../source/mact/src/file_lib.cpp; sourceTree = SOURCE_ROOT; }; + 0008E72A19F1ABB80091588D /* file_lib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = file_lib.h; path = ../../source/mact/include/file_lib.h; sourceTree = SOURCE_ROOT; }; + 0008E72B19F1ABB80091588D /* joystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = joystick.cpp; path = ../../source/mact/src/joystick.cpp; sourceTree = SOURCE_ROOT; }; + 0008E72C19F1ABB80091588D /* joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = joystick.h; path = ../../source/mact/include/joystick.h; sourceTree = SOURCE_ROOT; }; + 0008E72D19F1ABB80091588D /* keyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = keyboard.cpp; path = ../../source/mact/src/keyboard.cpp; sourceTree = SOURCE_ROOT; }; + 0008E72E19F1ABB80091588D /* keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = keyboard.h; path = ../../source/mact/include/keyboard.h; sourceTree = SOURCE_ROOT; }; + 0008E73219F1ABB80091588D /* mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = mouse.h; path = ../../source/mact/include/mouse.h; sourceTree = SOURCE_ROOT; }; + 0008E73319F1ABB80091588D /* scriplib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = scriplib.cpp; path = ../../source/mact/src/scriplib.cpp; sourceTree = SOURCE_ROOT; }; + 0008E73419F1ABB80091588D /* scriplib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = scriplib.h; path = ../../source/mact/include/scriplib.h; sourceTree = SOURCE_ROOT; }; + 0008E8A119F1AC530091588D /* a.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = a.h; path = ../../source/build/include/a.h; sourceTree = SOURCE_ROOT; }; + 0008E8A219F1AC530091588D /* baselayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = baselayer.h; path = ../../source/build/include/baselayer.h; sourceTree = SOURCE_ROOT; }; + 0008E8A319F1AC530091588D /* build.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = build.h; path = ../../source/build/include/build.h; sourceTree = SOURCE_ROOT; }; + 0008E8A419F1AC530091588D /* cache1d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = cache1d.h; path = ../../source/build/include/cache1d.h; sourceTree = SOURCE_ROOT; }; + 0008E8A519F1AC530091588D /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = common.h; path = ../../source/build/include/common.h; sourceTree = SOURCE_ROOT; }; + 0008E8A619F1AC530091588D /* compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = compat.h; path = ../../source/build/include/compat.h; sourceTree = SOURCE_ROOT; }; + 0008E8A719F1AC530091588D /* crc32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = crc32.h; path = ../../source/build/include/crc32.h; sourceTree = SOURCE_ROOT; }; + 0008E8A819F1AC530091588D /* dxdidf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = dxdidf.h; path = ../../source/build/include/dxdidf.h; sourceTree = SOURCE_ROOT; }; + 0008E8A919F1AC530091588D /* dxtfilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = dxtfilter.h; path = ../../source/build/include/dxtfilter.h; sourceTree = SOURCE_ROOT; }; + 0008E8AB19F1AC530091588D /* editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = editor.h; path = ../../source/build/include/editor.h; sourceTree = SOURCE_ROOT; }; + 0008E8AC19F1AC530091588D /* glbuild.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = glbuild.h; path = ../../source/build/include/glbuild.h; sourceTree = SOURCE_ROOT; }; + 0008E8AD19F1AC530091588D /* glext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = glext.h; path = ../../source/build/include/glext.h; sourceTree = SOURCE_ROOT; }; + 0008E8AF19F1AC530091588D /* hightile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = hightile.h; path = ../../source/build/include/hightile.h; sourceTree = SOURCE_ROOT; }; + 0008E8B019F1AC530091588D /* kplib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = kplib.h; path = ../../source/build/include/kplib.h; sourceTree = SOURCE_ROOT; }; + 0008E8B219F1AC530091588D /* lz4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lz4.h; path = ../../source/build/include/lz4.h; sourceTree = SOURCE_ROOT; }; + 0008E8B419F1AC530091588D /* m32script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = m32script.h; path = ../../source/build/include/m32script.h; sourceTree = SOURCE_ROOT; }; + 0008E8B519F1AC530091588D /* mdsprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = mdsprite.h; path = ../../source/build/include/mdsprite.h; sourceTree = SOURCE_ROOT; }; + 0008E8B619F1AC530091588D /* mmulti.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = mmulti.h; path = ../../source/build/include/mmulti.h; sourceTree = SOURCE_ROOT; }; + 0008E8BA19F1AC530091588D /* mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = mutex.h; path = ../../source/build/include/mutex.h; sourceTree = SOURCE_ROOT; }; + 0008E8BB19F1AC530091588D /* osd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = osd.h; path = ../../source/build/include/osd.h; sourceTree = SOURCE_ROOT; }; + 0008E8BC19F1AC530091588D /* osxbits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = osxbits.h; path = ../../source/build/include/osxbits.h; sourceTree = SOURCE_ROOT; }; + 0008E8BE19F1AC530091588D /* polymer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = polymer.h; path = ../../source/build/include/polymer.h; sourceTree = SOURCE_ROOT; }; + 0008E8BF19F1AC530091588D /* polymost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = polymost.h; path = ../../source/build/include/polymost.h; sourceTree = SOURCE_ROOT; }; + 0008E8C019F1AC530091588D /* pragmas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = pragmas.h; path = ../../source/build/include/pragmas.h; sourceTree = SOURCE_ROOT; }; + 0008E8C119F1AC530091588D /* pragmas_arm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = pragmas_arm.h; path = ../../source/build/include/pragmas_arm.h; sourceTree = SOURCE_ROOT; }; + 0008E8C219F1AC530091588D /* pragmas_ppc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = pragmas_ppc.h; path = ../../source/build/include/pragmas_ppc.h; sourceTree = SOURCE_ROOT; }; + 0008E8C319F1AC530091588D /* pragmas_x86_gcc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = pragmas_x86_gcc.h; path = ../../source/build/include/pragmas_x86_gcc.h; sourceTree = SOURCE_ROOT; }; + 0008E8C519F1AC530091588D /* prlights.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = prlights.h; path = ../../source/build/include/prlights.h; sourceTree = SOURCE_ROOT; }; + 0008E8C619F1AC530091588D /* rawinput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = rawinput.h; path = ../../source/build/include/rawinput.h; sourceTree = SOURCE_ROOT; }; + 0008E8C719F1AC530091588D /* renderlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = renderlayer.h; path = ../../source/build/include/renderlayer.h; sourceTree = SOURCE_ROOT; }; + 0008E8C819F1AC530091588D /* scancodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = scancodes.h; path = ../../source/build/include/scancodes.h; sourceTree = SOURCE_ROOT; }; + 0008E8C919F1AC530091588D /* scriptfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = scriptfile.h; path = ../../source/build/include/scriptfile.h; sourceTree = SOURCE_ROOT; }; + 0008E8CA19F1AC530091588D /* sdl_inc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = sdl_inc.h; path = ../../source/build/include/sdl_inc.h; sourceTree = SOURCE_ROOT; }; + 0008E8CB19F1AC530091588D /* sdlappicon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = sdlappicon.h; path = ../../source/build/include/sdlappicon.h; sourceTree = SOURCE_ROOT; }; + 0008E8CC19F1AC530091588D /* sdlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = sdlayer.h; path = ../../source/build/include/sdlayer.h; sourceTree = SOURCE_ROOT; }; + 0008E8CF19F1AC530091588D /* texcache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = texcache.h; path = ../../source/build/include/texcache.h; sourceTree = SOURCE_ROOT; }; + 0008E8D019F1AC530091588D /* tracker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = tracker.hpp; path = ../../source/build/include/tracker.hpp; sourceTree = SOURCE_ROOT; }; + 0008E8D119F1AC530091588D /* tracker_operator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = tracker_operator.hpp; path = ../../source/build/include/tracker_operator.hpp; sourceTree = SOURCE_ROOT; }; + 0008E8D219F1AC530091588D /* tracker_operators.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = tracker_operators.hpp; path = ../../source/build/include/tracker_operators.hpp; sourceTree = SOURCE_ROOT; }; + 0008E8D519F1AC530091588D /* xxhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xxhash.h; path = ../../source/build/include/xxhash.h; sourceTree = SOURCE_ROOT; }; + 0008E8DC19F1AC530091588D /* baselayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = baselayer.cpp; path = ../../source/build/src/baselayer.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8DD19F1AC530091588D /* build.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = build.cpp; path = ../../source/build/src/build.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8DE19F1AC530091588D /* cache1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = cache1d.cpp; path = ../../source/build/src/cache1d.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8DF19F1AC530091588D /* common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = common.cpp; path = ../../source/build/src/common.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8E019F1AC530091588D /* compat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = compat.cpp; path = ../../source/build/src/compat.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8E119F1AC530091588D /* config.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = config.cpp; path = ../../source/build/src/config.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8E219F1AC530091588D /* crc32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = crc32.cpp; path = ../../source/build/src/crc32.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8E319F1AC530091588D /* defs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = defs.cpp; path = ../../source/build/src/defs.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8E419F1AC530091588D /* dxtfilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = dxtfilter.cpp; path = ../../source/build/src/dxtfilter.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8E619F1AC530091588D /* engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = engine.cpp; path = ../../source/build/src/engine.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8E719F1AC540091588D /* engine_oldmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = engine_oldmap.h; path = ../../source/build/src/engine_oldmap.h; sourceTree = SOURCE_ROOT; }; + 0008E8E819F1AC540091588D /* engine_priv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = engine_priv.h; path = ../../source/build/src/engine_priv.h; sourceTree = SOURCE_ROOT; }; + 0008E8E919F1AC540091588D /* glbuild.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = glbuild.cpp; path = ../../source/build/src/glbuild.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8EB19F1AC540091588D /* hightile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = hightile.cpp; path = ../../source/build/src/hightile.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8EC19F1AC540091588D /* kplib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = kplib.cpp; path = ../../source/build/src/kplib.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8EE19F1AC540091588D /* lz4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lz4.c; path = ../../source/build/src/lz4.c; sourceTree = SOURCE_ROOT; }; + 0008E8F019F1AC540091588D /* mdsprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = mdsprite.cpp; path = ../../source/build/src/mdsprite.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8F619F1AC540091588D /* mmulti_null.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = mmulti_null.cpp; path = ../../source/build/src/mmulti_null.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8F719F1AC540091588D /* mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = mutex.cpp; path = ../../source/build/src/mutex.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8F819F1AC540091588D /* osd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = osd.cpp; path = ../../source/build/src/osd.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8F919F1AC540091588D /* osxbits.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = osxbits.mm; path = ../../source/build/src/osxbits.mm; sourceTree = SOURCE_ROOT; }; + 0008E8FA19F1AC540091588D /* polymer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = polymer.cpp; path = ../../source/build/src/polymer.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8FB19F1AC540091588D /* polymost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = polymost.cpp; path = ../../source/build/src/polymost.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8FC19F1AC540091588D /* pragmas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = pragmas.cpp; path = ../../source/build/src/pragmas.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8FE19F1AC540091588D /* scriptfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = scriptfile.cpp; path = ../../source/build/src/scriptfile.cpp; sourceTree = SOURCE_ROOT; }; + 0008E8FF19F1AC540091588D /* sdlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = sdlayer.cpp; path = ../../source/build/src/sdlayer.cpp; sourceTree = SOURCE_ROOT; }; + 0008E90019F1AC540091588D /* sdlkeytrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = sdlkeytrans.cpp; path = ../../source/build/src/sdlkeytrans.cpp; sourceTree = SOURCE_ROOT; }; + 0008E90219F1AC540091588D /* smalltextfont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = smalltextfont.cpp; path = ../../source/build/src/smalltextfont.cpp; sourceTree = SOURCE_ROOT; }; + 0008E90419F1AC540091588D /* startosx.editor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = startosx.editor.mm; path = ../../source/build/src/startosx.editor.mm; sourceTree = SOURCE_ROOT; }; + 0008E90619F1AC540091588D /* texcache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = texcache.cpp; path = ../../source/build/src/texcache.cpp; sourceTree = SOURCE_ROOT; }; + 0008E90719F1AC540091588D /* textfont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = textfont.cpp; path = ../../source/build/src/textfont.cpp; sourceTree = SOURCE_ROOT; }; + 0008E91F19F1AC540091588D /* voxmodel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = voxmodel.cpp; path = ../../source/build/src/voxmodel.cpp; sourceTree = SOURCE_ROOT; }; + 0008E92219F1AC540091588D /* xxhash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xxhash.c; path = ../../source/build/src/xxhash.c; sourceTree = SOURCE_ROOT; }; + 0008E99919F1AD9B0091588D /* _functio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = _functio.h; path = ../../source/duke3d/src/_functio.h; sourceTree = SOURCE_ROOT; }; + 0008E99A19F1AD9B0091588D /* _midi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = _midi.h; path = ../../source/duke3d/src/_midi.h; sourceTree = SOURCE_ROOT; }; + 0008E99B19F1AD9B0091588D /* _rts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = _rts.h; path = ../../source/duke3d/src/_rts.h; sourceTree = SOURCE_ROOT; }; + 0008E99E19F1AD9B0091588D /* actors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = actors.cpp; path = ../../source/duke3d/src/actors.cpp; sourceTree = SOURCE_ROOT; }; + 0008E99F19F1AD9B0091588D /* actors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = actors.h; path = ../../source/duke3d/src/actors.h; sourceTree = SOURCE_ROOT; }; + 0008E9A019F1AD9B0091588D /* anim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = anim.cpp; path = ../../source/duke3d/src/anim.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9A119F1AD9B0091588D /* anim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = anim.h; path = ../../source/duke3d/src/anim.h; sourceTree = SOURCE_ROOT; }; + 0008E9A219F1AD9B0091588D /* animvpx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = animvpx.cpp; path = ../../source/build/src/animvpx.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9A319F1AD9B0091588D /* animvpx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = animvpx.h; path = ../../source/build/include/animvpx.h; sourceTree = SOURCE_ROOT; }; + 0008E9A419F1AD9B0091588D /* config.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = config.cpp; path = ../../source/duke3d/src/config.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9A519F1AD9B0091588D /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = config.h; path = ../../source/duke3d/src/config.h; sourceTree = SOURCE_ROOT; }; + 0008E9A619F1AD9B0091588D /* demo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = demo.cpp; path = ../../source/duke3d/src/demo.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9A719F1AD9B0091588D /* demo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = demo.h; path = ../../source/duke3d/src/demo.h; sourceTree = SOURCE_ROOT; }; + 0008E9A819F1AD9B0091588D /* duke3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = duke3d.h; path = ../../source/duke3d/src/duke3d.h; sourceTree = SOURCE_ROOT; }; + 0008E9A919F1AD9B0091588D /* function.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = function.h; path = ../../source/duke3d/src/function.h; sourceTree = SOURCE_ROOT; }; + 0008E9AC19F1AD9B0091588D /* game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = game.cpp; path = ../../source/duke3d/src/game.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9AD19F1AD9B0091588D /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = game.h; path = ../../source/duke3d/src/game.h; sourceTree = SOURCE_ROOT; }; + 0008E9AE19F1AD9B0091588D /* gamedef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = gamedef.cpp; path = ../../source/duke3d/src/gamedef.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9AF19F1AD9B0091588D /* gamedef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = gamedef.h; path = ../../source/duke3d/src/gamedef.h; sourceTree = SOURCE_ROOT; }; + 0008E9B019F1AD9B0091588D /* gamedefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = gamedefs.h; path = ../../source/duke3d/src/gamedefs.h; sourceTree = SOURCE_ROOT; }; + 0008E9B119F1AD9B0091588D /* gameexec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = gameexec.cpp; path = ../../source/duke3d/src/gameexec.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9B219F1AD9B0091588D /* gameexec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = gameexec.h; path = ../../source/duke3d/src/gameexec.h; sourceTree = SOURCE_ROOT; }; + 0008E9B319F1AD9B0091588D /* GameListSource.game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = GameListSource.game.h; path = ../../source/duke3d/src/GameListSource.game.h; sourceTree = SOURCE_ROOT; }; + 0008E9B419F1AD9B0091588D /* GameListSource.game.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = GameListSource.game.mm; path = ../../source/duke3d/src/GameListSource.game.mm; sourceTree = SOURCE_ROOT; }; + 0008E9B519F1AD9B0091588D /* gamestructures.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = gamestructures.cpp; path = ../../source/duke3d/src/gamestructures.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9B619F1AD9B0091588D /* gamevars.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = gamevars.cpp; path = ../../source/duke3d/src/gamevars.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9B719F1AD9B0091588D /* gamevars.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = gamevars.h; path = ../../source/duke3d/src/gamevars.h; sourceTree = SOURCE_ROOT; }; + 0008E9B819F1AD9B0091588D /* global.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = global.cpp; path = ../../source/duke3d/src/global.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9B919F1AD9B0091588D /* global.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = global.h; path = ../../source/duke3d/src/global.h; sourceTree = SOURCE_ROOT; }; + 0008E9BA19F1AD9B0091588D /* GrpFile.game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = GrpFile.game.h; path = ../../source/duke3d/src/GrpFile.game.h; sourceTree = SOURCE_ROOT; }; + 0008E9BB19F1AD9B0091588D /* GrpFile.game.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = GrpFile.game.mm; path = ../../source/duke3d/src/GrpFile.game.mm; sourceTree = SOURCE_ROOT; }; + 0008E9BC19F1AD9B0091588D /* grpscan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = grpscan.cpp; path = ../../source/duke3d/src/grpscan.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9BD19F1AD9B0091588D /* grpscan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = grpscan.h; path = ../../source/duke3d/src/grpscan.h; sourceTree = SOURCE_ROOT; }; + 0008E9BE19F1AD9B0091588D /* input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = input.cpp; path = ../../source/duke3d/src/input.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9BF19F1AD9B0091588D /* input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = input.h; path = ../../source/duke3d/src/input.h; sourceTree = SOURCE_ROOT; }; + 0008E9C019F1AD9B0091588D /* keys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = keys.h; path = ../../source/duke3d/src/keys.h; sourceTree = SOURCE_ROOT; }; + 0008E9C119F1AD9B0091588D /* macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = macros.h; path = ../../source/duke3d/src/macros.h; sourceTree = SOURCE_ROOT; }; + 0008E9C219F1AD9B0091588D /* menus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = menus.cpp; path = ../../source/duke3d/src/menus.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9C319F1AD9B0091588D /* menus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = menus.h; path = ../../source/duke3d/src/menus.h; sourceTree = SOURCE_ROOT; }; + 0008E9C419F1AD9B0091588D /* names.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = names.h; path = ../../source/duke3d/src/names.h; sourceTree = SOURCE_ROOT; }; + 0008E9C519F1AD9B0091588D /* namesdyn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = namesdyn.cpp; path = ../../source/duke3d/src/namesdyn.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9C619F1AD9B0091588D /* namesdyn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = namesdyn.h; path = ../../source/duke3d/src/namesdyn.h; sourceTree = SOURCE_ROOT; }; + 0008E9C719F1AD9B0091588D /* net.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = net.cpp; path = ../../source/duke3d/src/net.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9C819F1AD9B0091588D /* net.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = net.h; path = ../../source/duke3d/src/net.h; sourceTree = SOURCE_ROOT; }; + 0008E9C919F1AD9B0091588D /* osdcmds.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = osdcmds.cpp; path = ../../source/duke3d/src/osdcmds.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9CA19F1AD9B0091588D /* osdcmds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = osdcmds.h; path = ../../source/duke3d/src/osdcmds.h; sourceTree = SOURCE_ROOT; }; + 0008E9CB19F1AD9B0091588D /* osdfuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = osdfuncs.cpp; path = ../../source/duke3d/src/osdfuncs.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9CC19F1AD9B0091588D /* osdfuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = osdfuncs.h; path = ../../source/duke3d/src/osdfuncs.h; sourceTree = SOURCE_ROOT; }; + 0008E9CD19F1AD9B0091588D /* player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = player.cpp; path = ../../source/duke3d/src/player.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9CE19F1AD9B0091588D /* player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = player.h; path = ../../source/duke3d/src/player.h; sourceTree = SOURCE_ROOT; }; + 0008E9CF19F1AD9B0091588D /* premap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = premap.cpp; path = ../../source/duke3d/src/premap.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9D019F1AD9B0091588D /* premap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = premap.h; path = ../../source/duke3d/src/premap.h; sourceTree = SOURCE_ROOT; }; + 0008E9D119F1AD9B0091588D /* quotes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = quotes.h; path = ../../source/duke3d/src/quotes.h; sourceTree = SOURCE_ROOT; }; + 0008E9D219F1AD9B0091588D /* rev.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = rev.cpp; path = ../../source/build/src/rev.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9D319F1AD9B0091588D /* rts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = rts.cpp; path = ../../source/duke3d/src/rts.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9D419F1AD9B0091588D /* rts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = rts.h; path = ../../source/duke3d/src/rts.h; sourceTree = SOURCE_ROOT; }; + 0008E9D519F1AD9B0091588D /* savegame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = savegame.cpp; path = ../../source/duke3d/src/savegame.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9D619F1AD9B0091588D /* savegame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = savegame.h; path = ../../source/duke3d/src/savegame.h; sourceTree = SOURCE_ROOT; }; + 0008E9D719F1AD9B0091588D /* sdlmusic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = sdlmusic.cpp; path = ../../source/duke3d/src/sdlmusic.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9DA19F1AD9B0091588D /* sector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = sector.cpp; path = ../../source/duke3d/src/sector.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9DB19F1AD9B0091588D /* sector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = sector.h; path = ../../source/duke3d/src/sector.h; sourceTree = SOURCE_ROOT; }; + 0008E9DC19F1AD9B0091588D /* soundefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = soundefs.h; path = ../../source/duke3d/src/soundefs.h; sourceTree = SOURCE_ROOT; }; + 0008E9DD19F1AD9B0091588D /* sounds.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = sounds.cpp; path = ../../source/duke3d/src/sounds.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9DE19F1AD9B0091588D /* sounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = sounds.h; path = ../../source/duke3d/src/sounds.h; sourceTree = SOURCE_ROOT; }; + 0008E9DF19F1AD9B0091588D /* soundsdyn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = soundsdyn.cpp; path = ../../source/duke3d/src/soundsdyn.cpp; sourceTree = SOURCE_ROOT; }; + 0008E9E019F1AD9B0091588D /* soundsdyn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = soundsdyn.h; path = ../../source/duke3d/src/soundsdyn.h; sourceTree = SOURCE_ROOT; }; + 0008E9E119F1AD9B0091588D /* standard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = standard.h; path = ../../source/duke3d/src/standard.h; sourceTree = SOURCE_ROOT; }; + 0008E9E219F1AD9B0091588D /* startosx.game.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = startosx.game.mm; path = ../../source/duke3d/src/startosx.game.mm; sourceTree = SOURCE_ROOT; }; + 0008EA0419F1ADC90091588D /* common_game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = common_game.h; path = ../../source/duke3d/src/common_game.h; sourceTree = SOURCE_ROOT; }; + 0008EA0519F1ADC90091588D /* common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = common.cpp; path = ../../source/duke3d/src/common.cpp; sourceTree = SOURCE_ROOT; }; + 0008EA0619F1ADC90091588D /* sounds_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = sounds_common.h; path = ../../source/duke3d/src/sounds_common.h; sourceTree = SOURCE_ROOT; }; + 0008EA0D19F1AE820091588D /* astub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = astub.cpp; path = ../../source/duke3d/src/astub.cpp; sourceTree = SOURCE_ROOT; }; + 0008EA0E19F1AE820091588D /* m32common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = m32common.cpp; path = ../../source/duke3d/src/m32common.cpp; sourceTree = SOURCE_ROOT; }; + 0008EA0F19F1AE820091588D /* m32def.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = m32def.cpp; path = ../../source/duke3d/src/m32def.cpp; sourceTree = SOURCE_ROOT; }; + 0008EA1019F1AE820091588D /* m32def.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = m32def.h; path = ../../source/duke3d/src/m32def.h; sourceTree = SOURCE_ROOT; }; + 0008EA1119F1AE820091588D /* m32exec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = m32exec.cpp; path = ../../source/duke3d/src/m32exec.cpp; sourceTree = SOURCE_ROOT; }; + 0008EA1219F1AE820091588D /* m32structures.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = m32structures.cpp; path = ../../source/duke3d/src/m32structures.cpp; sourceTree = SOURCE_ROOT; }; + 0008EA1319F1AE820091588D /* m32vars.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = m32vars.cpp; path = ../../source/duke3d/src/m32vars.cpp; sourceTree = SOURCE_ROOT; }; + 0008EA1419F1AE820091588D /* sounds_mapster32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = sounds_mapster32.cpp; path = ../../source/duke3d/src/sounds_mapster32.cpp; sourceTree = SOURCE_ROOT; }; + 0008EA1519F1AE820091588D /* sounds_mapster32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = sounds_mapster32.h; path = ../../source/duke3d/src/sounds_mapster32.h; sourceTree = SOURCE_ROOT; }; 0008EA1D19F1AEFC0091588D /* eduke32.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = eduke32.icns; path = bundles/EDuke32.app/Contents/Resources/eduke32.icns; sourceTree = SOURCE_ROOT; }; 0008EA4919F1B0020091588D /* libENet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libENet.a; sourceTree = BUILT_PRODUCTS_DIR; }; 0008EA5019F1B04F0091588D /* callbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = callbacks.h; path = ../../source/enet/include/enet/callbacks.h; sourceTree = SOURCE_ROOT; }; @@ -768,9 +765,9 @@ 000C487519F35517006E6B52 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = iOS/Info.plist; sourceTree = SOURCE_ROOT; }; 000C487719F35517006E6B52 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 000C487F19F35517006E6B52 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = iOS/Images.xcassets; sourceTree = SOURCE_ROOT; }; - 000C48CE19F35D6E006E6B52 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../../../SDL/Xcode-iOS/SDL/SDL.xcodeproj"; sourceTree = ""; }; + 000C48CE19F35D6E006E6B52 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../SDL/Xcode-iOS/SDL/SDL.xcodeproj"; sourceTree = ""; }; 000C48D619F35D92006E6B52 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 000C48EB19F35DD7006E6B52 /* SDL_mixer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_mixer.xcodeproj; path = "../../../../../SDL_mixer/Xcode-iOS/SDL_mixer.xcodeproj"; sourceTree = ""; }; + 000C48EB19F35DD7006E6B52 /* SDL_mixer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_mixer.xcodeproj; path = "../../../SDL_mixer/Xcode-iOS/SDL_mixer.xcodeproj"; sourceTree = ""; }; 001382DE19F361B60007DA6C /* libBUILD-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libBUILD-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 001382F819F361B80007DA6C /* libMACT-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libMACT-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 0013831B19F361BB0007DA6C /* libAudioLib-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libAudioLib-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -787,60 +784,60 @@ 00970E2019F2076B00873EB9 /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = /usr/local/lib/libvorbis.a; sourceTree = ""; }; 00970E2119F2076B00873EB9 /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = /usr/local/lib/libvorbisfile.a; sourceTree = ""; }; 00970E2219F2076B00873EB9 /* libvpx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvpx.a; path = /usr/local/lib/libvpx.a; sourceTree = ""; }; - 00970E3319F207F000873EB9 /* a-c.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "a-c.c"; path = "../../build/src/a-c.c"; sourceTree = SOURCE_ROOT; }; - 00970E4E19F2108600873EB9 /* driver_nosound.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = driver_nosound.c; path = ../../source/jaudiolib/src/driver_nosound.c; sourceTree = SOURCE_ROOT; }; - 00970E4F19F2108600873EB9 /* driver_nosound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = driver_nosound.h; path = ../../source/jaudiolib/src/driver_nosound.h; sourceTree = SOURCE_ROOT; }; + 00970E3319F207F000873EB9 /* a-c.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = "a-c.cpp"; path = "../../source/build/src/a-c.cpp"; sourceTree = SOURCE_ROOT; }; + 00970E4E19F2108600873EB9 /* driver_nosound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = driver_nosound.cpp; path = ../../source/audiolib/src/driver_nosound.cpp; sourceTree = SOURCE_ROOT; }; + 00970E4F19F2108600873EB9 /* driver_nosound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = driver_nosound.h; path = ../../source/audiolib/src/driver_nosound.h; sourceTree = SOURCE_ROOT; }; 00970E5719F2128300873EB9 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 00970E5A19F2139500873EB9 /* ForceFeedback.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ForceFeedback.framework; path = System/Library/Frameworks/ForceFeedback.framework; sourceTree = SDKROOT; }; 00970E5D19F213B300873EB9 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; }; 00970E6019F2142400873EB9 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; - 00CD003119F374ED00636963 /* duke3d.grp */ = {isa = PBXFileReference; lastKnownFileType = file; name = duke3d.grp; path = ../../../../../duke3d.grp; sourceTree = SOURCE_ROOT; }; - 2038AE951A8F122D0093B7B2 /* libdivide.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libdivide.h; path = ../../build/include/libdivide.h; sourceTree = SOURCE_ROOT; }; - 2038AE981A8F12590093B7B2 /* md4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = md4.h; path = ../../build/include/md4.h; sourceTree = SOURCE_ROOT; }; - 2038AE9B1A8F126C0093B7B2 /* md4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = md4.c; path = ../../build/src/md4.c; sourceTree = SOURCE_ROOT; }; - 2038AE9E1A8F12B60093B7B2 /* animsounds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = animsounds.c; path = ../../source/animsounds.c; sourceTree = SOURCE_ROOT; }; - 2038AE9F1A8F12B60093B7B2 /* animsounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = animsounds.h; path = ../../source/animsounds.h; sourceTree = SOURCE_ROOT; }; - 2038AEA21A8F137E0093B7B2 /* DUKE.RTS */ = {isa = PBXFileReference; lastKnownFileType = file; name = DUKE.RTS; path = ../../../../../DUKE.RTS; sourceTree = SOURCE_ROOT; }; - 2044C9831E089F2500A8C543 /* palette.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = palette.h; path = ../../build/include/palette.h; sourceTree = SOURCE_ROOT; }; - 2044C9891E08A66B00A8C543 /* palette.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = palette.c; path = ../../build/src/palette.c; sourceTree = SOURCE_ROOT; }; - 2044C98C1E08A69700A8C543 /* clip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = clip.c; path = ../../build/src/clip.c; sourceTree = SOURCE_ROOT; }; - 2044C98F1E08A6BC00A8C543 /* screenshot.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = screenshot.c; path = ../../build/src/screenshot.c; sourceTree = SOURCE_ROOT; }; - 2044C9981E08A72200A8C543 /* mhk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mhk.c; path = ../../build/src/mhk.c; sourceTree = SOURCE_ROOT; }; - 2044C99B1E08A74100A8C543 /* tiles.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tiles.c; path = ../../build/src/tiles.c; sourceTree = SOURCE_ROOT; }; - 204D6B4F1C9896B0001FA505 /* inv.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = inv.h; path = ../../source/inv.h; sourceTree = SOURCE_ROOT; }; - 204D6B571C98973F001FA505 /* Math.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Math.hpp; path = ../../source/android/etcpak/Math.hpp; sourceTree = SOURCE_ROOT; }; - 204D6B581C98973F001FA505 /* ProcessCommon.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ProcessCommon.hpp; path = ../../source/android/etcpak/ProcessCommon.hpp; sourceTree = SOURCE_ROOT; }; - 204D6B591C98973F001FA505 /* ProcessRGB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ProcessRGB.cpp; path = ../../source/android/etcpak/ProcessRGB.cpp; sourceTree = SOURCE_ROOT; }; - 204D6B5A1C98973F001FA505 /* ProcessRGB.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ProcessRGB.hpp; path = ../../source/android/etcpak/ProcessRGB.hpp; sourceTree = SOURCE_ROOT; }; - 204D6B5B1C98973F001FA505 /* Tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Tables.cpp; path = ../../source/android/etcpak/Tables.cpp; sourceTree = SOURCE_ROOT; }; - 204D6B5C1C98973F001FA505 /* Tables.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Tables.hpp; path = ../../source/android/etcpak/Tables.hpp; sourceTree = SOURCE_ROOT; }; - 204D6B5D1C98973F001FA505 /* Types.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Types.hpp; path = ../../source/android/etcpak/Types.hpp; sourceTree = SOURCE_ROOT; }; - 204D6B5E1C98973F001FA505 /* Vector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Vector.hpp; path = ../../source/android/etcpak/Vector.hpp; sourceTree = SOURCE_ROOT; }; - 206B3A051B074F3000E5DBD0 /* jwzgles.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jwzgles.h; path = ../../build/include/jwzgles.h; sourceTree = SOURCE_ROOT; }; - 206B3A061B074F3000E5DBD0 /* jwzglesI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jwzglesI.h; path = ../../build/include/jwzglesI.h; sourceTree = SOURCE_ROOT; }; - 206B3A0B1B074F6400E5DBD0 /* jwzgles.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jwzgles.c; path = ../../build/src/jwzgles.c; sourceTree = SOURCE_ROOT; }; + 00CD003119F374ED00636963 /* duke3d.grp */ = {isa = PBXFileReference; lastKnownFileType = file; name = duke3d.grp; path = ../../../duke3d.grp; sourceTree = SOURCE_ROOT; }; + 2038AE951A8F122D0093B7B2 /* libdivide.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = libdivide.h; path = ../../source/build/include/libdivide.h; sourceTree = SOURCE_ROOT; }; + 2038AE981A8F12590093B7B2 /* md4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = md4.h; path = ../../source/build/include/md4.h; sourceTree = SOURCE_ROOT; }; + 2038AE9B1A8F126C0093B7B2 /* md4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = md4.cpp; path = ../../source/build/src/md4.cpp; sourceTree = SOURCE_ROOT; }; + 2038AE9E1A8F12B60093B7B2 /* animsounds.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = animsounds.cpp; path = ../../source/duke3d/src/animsounds.cpp; sourceTree = SOURCE_ROOT; }; + 2038AE9F1A8F12B60093B7B2 /* animsounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = animsounds.h; path = ../../source/duke3d/src/animsounds.h; sourceTree = SOURCE_ROOT; }; + 2038AEA21A8F137E0093B7B2 /* DUKE.RTS */ = {isa = PBXFileReference; lastKnownFileType = file; name = DUKE.RTS; path = ../../../DUKE.RTS; sourceTree = SOURCE_ROOT; }; + 2044C9831E089F2500A8C543 /* palette.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = palette.h; path = ../../source/build/include/palette.h; sourceTree = SOURCE_ROOT; }; + 2044C9891E08A66B00A8C543 /* palette.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = palette.cpp; path = ../../source/build/src/palette.cpp; sourceTree = SOURCE_ROOT; }; + 2044C98C1E08A69700A8C543 /* clip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = clip.cpp; path = ../../source/build/src/clip.cpp; sourceTree = SOURCE_ROOT; }; + 2044C98F1E08A6BC00A8C543 /* screenshot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = screenshot.cpp; path = ../../source/build/src/screenshot.cpp; sourceTree = SOURCE_ROOT; }; + 2044C9981E08A72200A8C543 /* mhk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = mhk.cpp; path = ../../source/build/src/mhk.cpp; sourceTree = SOURCE_ROOT; }; + 2044C99B1E08A74100A8C543 /* tiles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = tiles.cpp; path = ../../source/build/src/tiles.cpp; sourceTree = SOURCE_ROOT; }; + 204D6B4F1C9896B0001FA505 /* inv.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; name = inv.h; path = ../../source/duke3d/src/inv.h; sourceTree = SOURCE_ROOT; }; + 204D6B571C98973F001FA505 /* Math.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Math.hpp; path = ../../source/etcpak/src/Math.hpp; sourceTree = SOURCE_ROOT; }; + 204D6B581C98973F001FA505 /* ProcessCommon.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ProcessCommon.hpp; path = ../../source/etcpak/src/ProcessCommon.hpp; sourceTree = SOURCE_ROOT; }; + 204D6B591C98973F001FA505 /* ProcessRGB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ProcessRGB.cpp; path = ../../source/etcpak/src/ProcessRGB.cpp; sourceTree = SOURCE_ROOT; }; + 204D6B5A1C98973F001FA505 /* ProcessRGB.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ProcessRGB.hpp; path = ../../source/etcpak/include/ProcessRGB.h; sourceTree = SOURCE_ROOT; }; + 204D6B5B1C98973F001FA505 /* Tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Tables.cpp; path = ../../source/etcpak/src/Tables.cpp; sourceTree = SOURCE_ROOT; }; + 204D6B5C1C98973F001FA505 /* Tables.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Tables.hpp; path = ../../source/etcpak/src/Tables.hpp; sourceTree = SOURCE_ROOT; }; + 204D6B5D1C98973F001FA505 /* Types.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Types.hpp; path = ../../source/etcpak/src/Types.hpp; sourceTree = SOURCE_ROOT; }; + 204D6B5E1C98973F001FA505 /* Vector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Vector.hpp; path = ../../source/etcpak/src/Vector.hpp; sourceTree = SOURCE_ROOT; }; + 206B3A051B074F3000E5DBD0 /* jwzgles.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = jwzgles.h; path = ../../source/build/include/jwzgles.h; sourceTree = SOURCE_ROOT; }; + 206B3A061B074F3000E5DBD0 /* jwzglesI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = jwzglesI.h; path = ../../source/build/include/jwzglesI.h; sourceTree = SOURCE_ROOT; }; + 206B3A0B1B074F6400E5DBD0 /* jwzgles.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jwzgles.c; path = ../../source/build/src/jwzgles.c; sourceTree = SOURCE_ROOT; }; 2085BEB91A8F23B9002BF4CE /* libSystem.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libSystem.dylib; path = usr/lib/libSystem.dylib; sourceTree = SDKROOT; }; 20C214691B02C19800917E58 /* game.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = game.png; path = bundles/EDuke32.app/Contents/Resources/game.png; sourceTree = SOURCE_ROOT; }; 20C2146E1B02C1D800917E58 /* build.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = build.png; path = bundles/Mapster32.app/Contents/Resources/build.png; sourceTree = SOURCE_ROOT; }; - 20CA2FA61BB2456E001231BF /* drivers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = drivers.h; path = ../../source/jaudiolib/include/drivers.h; sourceTree = SOURCE_ROOT; }; - 20CEFB111E08A86B0077879C /* 2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 2d.c; path = ../../build/src/2d.c; sourceTree = SOURCE_ROOT; }; - 20CEFB171E08A8830077879C /* hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hash.c; path = ../../build/src/hash.c; sourceTree = SOURCE_ROOT; }; - 20CEFB1A1E08A8CB0077879C /* xmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xmp.c; path = ../../source/jaudiolib/src/xmp.c; sourceTree = SOURCE_ROOT; }; - 20CEFB1D1E08A8FD0077879C /* hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hash.h; path = ../../build/include/hash.h; sourceTree = SOURCE_ROOT; }; - 20CEFB201E08A9130077879C /* buildtypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = buildtypes.h; path = ../../build/include/buildtypes.h; sourceTree = SOURCE_ROOT; }; - 20CEFB231E08A91D0077879C /* clip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = clip.h; path = ../../build/include/clip.h; sourceTree = SOURCE_ROOT; }; - 20E16CDF1C7022C300EE8446 /* cmdline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmdline.c; path = ../../source/cmdline.c; sourceTree = SOURCE_ROOT; }; - 20E16CE01C7022C300EE8446 /* cmdline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cmdline.h; path = ../../source/cmdline.h; sourceTree = SOURCE_ROOT; }; - 20E16CE61C7022DE00EE8446 /* screens.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = screens.c; path = ../../source/screens.c; sourceTree = SOURCE_ROOT; }; - 20E16CE71C7022DE00EE8446 /* screens.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = screens.h; path = ../../source/screens.h; sourceTree = SOURCE_ROOT; }; - 20F7124B1C6C19E5006B68D0 /* screentext.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = screentext.c; path = ../../source/screentext.c; sourceTree = SOURCE_ROOT; }; - 20F7124C1C6C19E5006B68D0 /* screentext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = screentext.h; path = ../../source/screentext.h; sourceTree = SOURCE_ROOT; }; - 20F7124F1C6C19F4006B68D0 /* sbar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sbar.c; path = ../../source/sbar.c; sourceTree = SOURCE_ROOT; }; - 20F712501C6C19F4006B68D0 /* sbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sbar.h; path = ../../source/sbar.h; sourceTree = SOURCE_ROOT; }; - 20F712531C6C1A07006B68D0 /* cheats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cheats.c; path = ../../source/cheats.c; sourceTree = SOURCE_ROOT; }; - 20F712541C6C1A07006B68D0 /* cheats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cheats.h; path = ../../source/cheats.h; sourceTree = SOURCE_ROOT; }; - 20FD1D471C44E4BE00C2E553 /* colmatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = colmatch.h; path = ../../build/include/colmatch.h; sourceTree = SOURCE_ROOT; }; - 20FD1D501C44E4E700C2E553 /* colmatch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = colmatch.c; path = ../../build/src/colmatch.c; sourceTree = SOURCE_ROOT; }; + 20CA2FA61BB2456E001231BF /* drivers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = drivers.h; path = ../../source/audiolib/include/drivers.h; sourceTree = SOURCE_ROOT; }; + 20CEFB111E08A86B0077879C /* 2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = 2d.cpp; path = ../../source/build/src/2d.cpp; sourceTree = SOURCE_ROOT; }; + 20CEFB171E08A8830077879C /* hash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = hash.cpp; path = ../../source/build/src/hash.cpp; sourceTree = SOURCE_ROOT; }; + 20CEFB1A1E08A8CB0077879C /* xmp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = xmp.cpp; path = ../../source/audiolib/src/xmp.cpp; sourceTree = SOURCE_ROOT; }; + 20CEFB1D1E08A8FD0077879C /* hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = hash.h; path = ../../source/build/include/hash.h; sourceTree = SOURCE_ROOT; }; + 20CEFB201E08A9130077879C /* buildtypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = buildtypes.h; path = ../../source/build/include/buildtypes.h; sourceTree = SOURCE_ROOT; }; + 20CEFB231E08A91D0077879C /* clip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = clip.h; path = ../../source/build/include/clip.h; sourceTree = SOURCE_ROOT; }; + 20E16CDF1C7022C300EE8446 /* cmdline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = cmdline.cpp; path = ../../source/duke3d/src/cmdline.cpp; sourceTree = SOURCE_ROOT; }; + 20E16CE01C7022C300EE8446 /* cmdline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = cmdline.h; path = ../../source/duke3d/src/cmdline.h; sourceTree = SOURCE_ROOT; }; + 20E16CE61C7022DE00EE8446 /* screens.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = screens.cpp; path = ../../source/duke3d/src/screens.cpp; sourceTree = SOURCE_ROOT; }; + 20E16CE71C7022DE00EE8446 /* screens.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = screens.h; path = ../../source/duke3d/src/screens.h; sourceTree = SOURCE_ROOT; }; + 20F7124B1C6C19E5006B68D0 /* screentext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = screentext.cpp; path = ../../source/duke3d/src/screentext.cpp; sourceTree = SOURCE_ROOT; }; + 20F7124C1C6C19E5006B68D0 /* screentext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = screentext.h; path = ../../source/duke3d/src/screentext.h; sourceTree = SOURCE_ROOT; }; + 20F7124F1C6C19F4006B68D0 /* sbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = sbar.cpp; path = ../../source/duke3d/src/sbar.cpp; sourceTree = SOURCE_ROOT; }; + 20F712501C6C19F4006B68D0 /* sbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = sbar.h; path = ../../source/duke3d/src/sbar.h; sourceTree = SOURCE_ROOT; }; + 20F712531C6C1A07006B68D0 /* cheats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = cheats.cpp; path = ../../source/duke3d/src/cheats.cpp; sourceTree = SOURCE_ROOT; }; + 20F712541C6C1A07006B68D0 /* cheats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = cheats.h; path = ../../source/duke3d/src/cheats.h; sourceTree = SOURCE_ROOT; }; + 20FD1D471C44E4BE00C2E553 /* colmatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = colmatch.h; path = ../../source/build/include/colmatch.h; sourceTree = SOURCE_ROOT; }; + 20FD1D501C44E4E700C2E553 /* colmatch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = colmatch.cpp; path = ../../source/build/src/colmatch.cpp; sourceTree = SOURCE_ROOT; }; 20FD1D6A1C44E64700C2E553 /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/System/Library/Frameworks/GameController.framework; sourceTree = DEVELOPER_DIR; }; /* End PBXFileReference section */ @@ -1069,99 +1066,96 @@ 000C487319F35517006E6B52 /* iOS */, 0008EA1D19F1AEFC0091588D /* eduke32.icns */, 20C214691B02C19800917E58 /* game.png */, - 0008EA0D19F1AE820091588D /* astub.c */, - 0008EA0E19F1AE820091588D /* m32common.c */, - 0008EA0F19F1AE820091588D /* m32def.c */, + 0008EA0D19F1AE820091588D /* astub.cpp */, + 0008EA0E19F1AE820091588D /* m32common.cpp */, + 0008EA0F19F1AE820091588D /* m32def.cpp */, 0008EA1019F1AE820091588D /* m32def.h */, - 0008EA1119F1AE820091588D /* m32exec.c */, - 0008EA1219F1AE820091588D /* m32structures.c */, - 0008EA1319F1AE820091588D /* m32vars.c */, - 0008EA1419F1AE820091588D /* sounds_mapster32.c */, + 0008EA1119F1AE820091588D /* m32exec.cpp */, + 0008EA1219F1AE820091588D /* m32structures.cpp */, + 0008EA1319F1AE820091588D /* m32vars.cpp */, + 0008EA1419F1AE820091588D /* sounds_mapster32.cpp */, 0008EA1519F1AE820091588D /* sounds_mapster32.h */, 0008EA0419F1ADC90091588D /* common_game.h */, - 0008EA0519F1ADC90091588D /* common.c */, + 0008EA0519F1ADC90091588D /* common.cpp */, 0008EA0619F1ADC90091588D /* sounds_common.h */, 0008E99919F1AD9B0091588D /* _functio.h */, 0008E99A19F1AD9B0091588D /* _midi.h */, 0008E99B19F1AD9B0091588D /* _rts.h */, - 0008E99E19F1AD9B0091588D /* actors.c */, + 0008E99E19F1AD9B0091588D /* actors.cpp */, 0008E99F19F1AD9B0091588D /* actors.h */, - 0008E9A019F1AD9B0091588D /* anim.c */, + 0008E9A019F1AD9B0091588D /* anim.cpp */, 0008E9A119F1AD9B0091588D /* anim.h */, - 2038AE9E1A8F12B60093B7B2 /* animsounds.c */, + 2038AE9E1A8F12B60093B7B2 /* animsounds.cpp */, 2038AE9F1A8F12B60093B7B2 /* animsounds.h */, - 0008E9A219F1AD9B0091588D /* animvpx.c */, - 0008E9A319F1AD9B0091588D /* animvpx.h */, - 20F712531C6C1A07006B68D0 /* cheats.c */, + 20F712531C6C1A07006B68D0 /* cheats.cpp */, 20F712541C6C1A07006B68D0 /* cheats.h */, - 20E16CDF1C7022C300EE8446 /* cmdline.c */, + 20E16CDF1C7022C300EE8446 /* cmdline.cpp */, 20E16CE01C7022C300EE8446 /* cmdline.h */, - 0008E9A419F1AD9B0091588D /* config.c */, + 0008E9A419F1AD9B0091588D /* config.cpp */, 0008E9A519F1AD9B0091588D /* config.h */, - 0008E9A619F1AD9B0091588D /* demo.c */, + 0008E9A619F1AD9B0091588D /* demo.cpp */, 0008E9A719F1AD9B0091588D /* demo.h */, 0008E9A819F1AD9B0091588D /* duke3d.h */, 0008E9A919F1AD9B0091588D /* function.h */, - 0008E9AC19F1AD9B0091588D /* game.c */, + 0008E9AC19F1AD9B0091588D /* game.cpp */, 0008E9AD19F1AD9B0091588D /* game.h */, - 0008E9AE19F1AD9B0091588D /* gamedef.c */, + 0008E9AE19F1AD9B0091588D /* gamedef.cpp */, 0008E9AF19F1AD9B0091588D /* gamedef.h */, 0008E9B019F1AD9B0091588D /* gamedefs.h */, - 0008E9B119F1AD9B0091588D /* gameexec.c */, + 0008E9B119F1AD9B0091588D /* gameexec.cpp */, 0008E9B219F1AD9B0091588D /* gameexec.h */, 0008E9B319F1AD9B0091588D /* GameListSource.game.h */, - 0008E9B419F1AD9B0091588D /* GameListSource.game.m */, - 0008E9B519F1AD9B0091588D /* gamestructures.c */, - 0008E9B619F1AD9B0091588D /* gamevars.c */, + 0008E9B419F1AD9B0091588D /* GameListSource.game.mm */, + 0008E9B519F1AD9B0091588D /* gamestructures.cpp */, + 0008E9B619F1AD9B0091588D /* gamevars.cpp */, 0008E9B719F1AD9B0091588D /* gamevars.h */, - 0008E9B819F1AD9B0091588D /* global.c */, + 0008E9B819F1AD9B0091588D /* global.cpp */, 0008E9B919F1AD9B0091588D /* global.h */, 0008E9BA19F1AD9B0091588D /* GrpFile.game.h */, - 0008E9BB19F1AD9B0091588D /* GrpFile.game.m */, - 0008E9BC19F1AD9B0091588D /* grpscan.c */, + 0008E9BB19F1AD9B0091588D /* GrpFile.game.mm */, + 0008E9BC19F1AD9B0091588D /* grpscan.cpp */, 0008E9BD19F1AD9B0091588D /* grpscan.h */, - 0008E9BE19F1AD9B0091588D /* input.c */, + 0008E9BE19F1AD9B0091588D /* input.cpp */, 0008E9BF19F1AD9B0091588D /* input.h */, 204D6B4F1C9896B0001FA505 /* inv.h */, 0008E9C019F1AD9B0091588D /* keys.h */, 0008E9C119F1AD9B0091588D /* macros.h */, - 0008E9C219F1AD9B0091588D /* menus.c */, + 0008E9C219F1AD9B0091588D /* menus.cpp */, 0008E9C319F1AD9B0091588D /* menus.h */, 0008E9C419F1AD9B0091588D /* names.h */, - 0008E9C519F1AD9B0091588D /* namesdyn.c */, + 0008E9C519F1AD9B0091588D /* namesdyn.cpp */, 0008E9C619F1AD9B0091588D /* namesdyn.h */, - 0008E9C719F1AD9B0091588D /* net.c */, + 0008E9C719F1AD9B0091588D /* net.cpp */, 0008E9C819F1AD9B0091588D /* net.h */, - 0008E9C919F1AD9B0091588D /* osdcmds.c */, + 0008E9C919F1AD9B0091588D /* osdcmds.cpp */, 0008E9CA19F1AD9B0091588D /* osdcmds.h */, - 0008E9CB19F1AD9B0091588D /* osdfuncs.c */, + 0008E9CB19F1AD9B0091588D /* osdfuncs.cpp */, 0008E9CC19F1AD9B0091588D /* osdfuncs.h */, - 0008E9CD19F1AD9B0091588D /* player.c */, + 0008E9CD19F1AD9B0091588D /* player.cpp */, 0008E9CE19F1AD9B0091588D /* player.h */, - 0008E9CF19F1AD9B0091588D /* premap.c */, + 0008E9CF19F1AD9B0091588D /* premap.cpp */, 0008E9D019F1AD9B0091588D /* premap.h */, 0008E9D119F1AD9B0091588D /* quotes.h */, - 0008E9D219F1AD9B0091588D /* rev.c */, - 0008E9D319F1AD9B0091588D /* rts.c */, + 0008E9D319F1AD9B0091588D /* rts.cpp */, 0008E9D419F1AD9B0091588D /* rts.h */, - 0008E9D519F1AD9B0091588D /* savegame.c */, + 0008E9D519F1AD9B0091588D /* savegame.cpp */, 0008E9D619F1AD9B0091588D /* savegame.h */, - 20F7124F1C6C19F4006B68D0 /* sbar.c */, + 20F7124F1C6C19F4006B68D0 /* sbar.cpp */, 20F712501C6C19F4006B68D0 /* sbar.h */, - 20E16CE61C7022DE00EE8446 /* screens.c */, + 20E16CE61C7022DE00EE8446 /* screens.cpp */, 20E16CE71C7022DE00EE8446 /* screens.h */, - 20F7124B1C6C19E5006B68D0 /* screentext.c */, + 20F7124B1C6C19E5006B68D0 /* screentext.cpp */, 20F7124C1C6C19E5006B68D0 /* screentext.h */, - 0008E9D719F1AD9B0091588D /* sdlmusic.c */, - 0008E9DA19F1AD9B0091588D /* sector.c */, + 0008E9D719F1AD9B0091588D /* sdlmusic.cpp */, + 0008E9DA19F1AD9B0091588D /* sector.cpp */, 0008E9DB19F1AD9B0091588D /* sector.h */, 0008E9DC19F1AD9B0091588D /* soundefs.h */, - 0008E9DD19F1AD9B0091588D /* sounds.c */, + 0008E9DD19F1AD9B0091588D /* sounds.cpp */, 0008E9DE19F1AD9B0091588D /* sounds.h */, - 0008E9DF19F1AD9B0091588D /* soundsdyn.c */, + 0008E9DF19F1AD9B0091588D /* soundsdyn.cpp */, 0008E9E019F1AD9B0091588D /* soundsdyn.h */, 0008E9E119F1AD9B0091588D /* standard.h */, - 0008E9E219F1AD9B0091588D /* startosx.game.m */, + 0008E9E219F1AD9B0091588D /* startosx.game.mm */, ); path = EDuke32; sourceTree = ""; @@ -1180,19 +1174,18 @@ children = ( 0008E72319F1ABB80091588D /* _control.h */, 0008E72419F1ABB80091588D /* _scrplib.h */, - 0008E72519F1ABB80091588D /* animlib.c */, + 0008E72519F1ABB80091588D /* animlib.cpp */, 0008E72619F1ABB80091588D /* animlib.h */, - 0008E72719F1ABB80091588D /* control.c */, + 0008E72719F1ABB80091588D /* control.cpp */, 0008E72819F1ABB80091588D /* control.h */, - 0008E72919F1ABB80091588D /* file_lib.c */, + 0008E72919F1ABB80091588D /* file_lib.cpp */, 0008E72A19F1ABB80091588D /* file_lib.h */, - 0008E72B19F1ABB80091588D /* joystick.c */, + 0008E72B19F1ABB80091588D /* joystick.cpp */, 0008E72C19F1ABB80091588D /* joystick.h */, - 0008E72D19F1ABB80091588D /* keyboard.c */, + 0008E72D19F1ABB80091588D /* keyboard.cpp */, 0008E72E19F1ABB80091588D /* keyboard.h */, - 0008E73119F1ABB80091588D /* mouse.c */, 0008E73219F1ABB80091588D /* mouse.h */, - 0008E73319F1ABB80091588D /* scriplib.c */, + 0008E73319F1ABB80091588D /* scriplib.cpp */, 0008E73419F1ABB80091588D /* scriplib.h */, ); name = MACT; @@ -1216,39 +1209,40 @@ 0008E6D019F1AAFE0091588D /* music.h */, ); name = include; - path = ../../source/jaudiolib/include; + path = ../../source/audiolib/include; sourceTree = ""; }; 0008E6D219F1AAFE0091588D /* src */ = { isa = PBXGroup; children = ( 0008E6D319F1AAFE0091588D /* _multivc.h */, - 00970E4E19F2108600873EB9 /* driver_nosound.c */, + 00970E4E19F2108600873EB9 /* driver_nosound.cpp */, 00970E4F19F2108600873EB9 /* driver_nosound.h */, - 0008E6D819F1AAFF0091588D /* driver_sdl.c */, + 0008E6D819F1AAFF0091588D /* driver_sdl.cpp */, 0008E6D919F1AAFF0091588D /* driver_sdl.h */, - 0008E6DA19F1AAFF0091588D /* drivers.c */, - 0008E6DC19F1AAFF0091588D /* flac.c */, - 0008E6DD19F1AAFF0091588D /* formats.c */, - 0008E6DE19F1AAFF0091588D /* fx_man.c */, + 0008E6DA19F1AAFF0091588D /* drivers.cpp */, + 0008E6DC19F1AAFF0091588D /* flac.cpp */, + 0008E6DD19F1AAFF0091588D /* formats.cpp */, + 0008E6DE19F1AAFF0091588D /* fx_man.cpp */, 0008E6DF19F1AAFF0091588D /* linklist.h */, - 0008E6E119F1AAFF0091588D /* mix.c */, - 0008E6E219F1AAFF0091588D /* mixst.c */, - 0008E6E319F1AAFF0091588D /* multivoc.c */, - 0008E6E519F1AAFF0091588D /* pitch.c */, + 0008E6E119F1AAFF0091588D /* mix.cpp */, + 0008E6E219F1AAFF0091588D /* mixst.cpp */, + 0008E6E319F1AAFF0091588D /* multivoc.cpp */, + 0008E6E519F1AAFF0091588D /* pitch.cpp */, 0008E6E619F1AAFF0091588D /* pitch.h */, - 0008E6E719F1AAFF0091588D /* vorbis.c */, - 0008E6E819F1AAFF0091588D /* xa.c */, - 20CEFB1A1E08A8CB0077879C /* xmp.c */, + 0008E6E719F1AAFF0091588D /* vorbis.cpp */, + 0008E6E819F1AAFF0091588D /* xa.cpp */, + 20CEFB1A1E08A8CB0077879C /* xmp.cpp */, ); name = src; - path = ../../source/jaudiolib/src; + path = ../../source/audiolib/src; sourceTree = ""; }; 0008E8A019F1AC530091588D /* include */ = { isa = PBXGroup; children = ( 0008E8A119F1AC530091588D /* a.h */, + 0008E9A319F1AD9B0091588D /* animvpx.h */, 0008E8A219F1AC530091588D /* baselayer.h */, 0008E8A319F1AC530091588D /* build.h */, 20CEFB201E08A9130077879C /* buildtypes.h */, @@ -1299,61 +1293,63 @@ 0008E8D519F1AC530091588D /* xxhash.h */, ); name = include; - path = ../../build/include; + path = ../../source/build/include; sourceTree = ""; }; 0008E8D619F1AC530091588D /* src */ = { isa = PBXGroup; children = ( 204D6B541C98973F001FA505 /* etcpak */, - 20CEFB111E08A86B0077879C /* 2d.c */, - 00970E3319F207F000873EB9 /* a-c.c */, + 20CEFB111E08A86B0077879C /* 2d.cpp */, + 00970E3319F207F000873EB9 /* a-c.cpp */, + 0008E9A219F1AD9B0091588D /* animvpx.cpp */, 20C2146E1B02C1D800917E58 /* build.png */, - 0008E8DC19F1AC530091588D /* baselayer.c */, - 0008E8DD19F1AC530091588D /* build.c */, - 0008E8DE19F1AC530091588D /* cache1d.c */, - 2044C98C1E08A69700A8C543 /* clip.c */, - 20FD1D501C44E4E700C2E553 /* colmatch.c */, - 0008E8DF19F1AC530091588D /* common.c */, - 0008E8E019F1AC530091588D /* compat.c */, - 0008E8E119F1AC530091588D /* config.c */, - 0008E8E219F1AC530091588D /* crc32.c */, - 0008E8E319F1AC530091588D /* defs.c */, - 0008E8E419F1AC530091588D /* dxtfilter.c */, - 0008E8E619F1AC530091588D /* engine.c */, + 0008E8DC19F1AC530091588D /* baselayer.cpp */, + 0008E8DD19F1AC530091588D /* build.cpp */, + 0008E8DE19F1AC530091588D /* cache1d.cpp */, + 2044C98C1E08A69700A8C543 /* clip.cpp */, + 20FD1D501C44E4E700C2E553 /* colmatch.cpp */, + 0008E8DF19F1AC530091588D /* common.cpp */, + 0008E8E019F1AC530091588D /* compat.cpp */, + 0008E8E119F1AC530091588D /* config.cpp */, + 0008E8E219F1AC530091588D /* crc32.cpp */, + 0008E8E319F1AC530091588D /* defs.cpp */, + 0008E8E419F1AC530091588D /* dxtfilter.cpp */, + 0008E8E619F1AC530091588D /* engine.cpp */, 0008E8E719F1AC540091588D /* engine_oldmap.h */, 0008E8E819F1AC540091588D /* engine_priv.h */, - 0008E8E919F1AC540091588D /* glbuild.c */, - 20CEFB171E08A8830077879C /* hash.c */, - 0008E8EB19F1AC540091588D /* hightile.c */, + 0008E8E919F1AC540091588D /* glbuild.cpp */, + 20CEFB171E08A8830077879C /* hash.cpp */, + 0008E8EB19F1AC540091588D /* hightile.cpp */, 206B3A0B1B074F6400E5DBD0 /* jwzgles.c */, - 0008E8EC19F1AC540091588D /* kplib.c */, + 0008E8EC19F1AC540091588D /* kplib.cpp */, 0008E8EE19F1AC540091588D /* lz4.c */, - 2038AE9B1A8F126C0093B7B2 /* md4.c */, - 0008E8F019F1AC540091588D /* mdsprite.c */, - 2044C9981E08A72200A8C543 /* mhk.c */, - 0008E8F619F1AC540091588D /* mmulti_null.c */, - 0008E8F719F1AC540091588D /* mutex.c */, - 0008E8F819F1AC540091588D /* osd.c */, - 0008E8F919F1AC540091588D /* osxbits.m */, - 2044C9891E08A66B00A8C543 /* palette.c */, - 0008E8FA19F1AC540091588D /* polymer.c */, - 0008E8FB19F1AC540091588D /* polymost.c */, - 0008E8FC19F1AC540091588D /* pragmas.c */, - 2044C98F1E08A6BC00A8C543 /* screenshot.c */, - 0008E8FE19F1AC540091588D /* scriptfile.c */, - 0008E8FF19F1AC540091588D /* sdlayer.c */, - 0008E90019F1AC540091588D /* sdlkeytrans.c */, - 0008E90219F1AC540091588D /* smalltextfont.c */, - 0008E90419F1AC540091588D /* startosx.editor.m */, - 0008E90619F1AC540091588D /* texcache.c */, - 0008E90719F1AC540091588D /* textfont.c */, - 2044C99B1E08A74100A8C543 /* tiles.c */, - 0008E91F19F1AC540091588D /* voxmodel.c */, + 2038AE9B1A8F126C0093B7B2 /* md4.cpp */, + 0008E8F019F1AC540091588D /* mdsprite.cpp */, + 2044C9981E08A72200A8C543 /* mhk.cpp */, + 0008E8F619F1AC540091588D /* mmulti_null.cpp */, + 0008E8F719F1AC540091588D /* mutex.cpp */, + 0008E8F819F1AC540091588D /* osd.cpp */, + 0008E8F919F1AC540091588D /* osxbits.mm */, + 2044C9891E08A66B00A8C543 /* palette.cpp */, + 0008E8FA19F1AC540091588D /* polymer.cpp */, + 0008E8FB19F1AC540091588D /* polymost.cpp */, + 0008E8FC19F1AC540091588D /* pragmas.cpp */, + 0008E9D219F1AD9B0091588D /* rev.cpp */, + 2044C98F1E08A6BC00A8C543 /* screenshot.cpp */, + 0008E8FE19F1AC540091588D /* scriptfile.cpp */, + 0008E8FF19F1AC540091588D /* sdlayer.cpp */, + 0008E90019F1AC540091588D /* sdlkeytrans.cpp */, + 0008E90219F1AC540091588D /* smalltextfont.cpp */, + 0008E90419F1AC540091588D /* startosx.editor.mm */, + 0008E90619F1AC540091588D /* texcache.cpp */, + 0008E90719F1AC540091588D /* textfont.cpp */, + 2044C99B1E08A74100A8C543 /* tiles.cpp */, + 0008E91F19F1AC540091588D /* voxmodel.cpp */, 0008E92219F1AC540091588D /* xxhash.c */, ); name = src; - path = ../../build/src; + path = ../../source/build/src; sourceTree = ""; }; 0008EA4D19F1B03A0091588D /* ENet */ = { @@ -1461,7 +1457,7 @@ 204D6B5E1C98973F001FA505 /* Vector.hpp */, ); name = etcpak; - path = ../../source/android/etcpak; + path = ../../source/etcpak; sourceTree = SOURCE_ROOT; }; /* End PBXGroup section */ @@ -1953,42 +1949,42 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0008E9F519F1AD9B0091588D /* namesdyn.c in Sources */, - 20E16CE81C7022DE00EE8446 /* screens.c in Sources */, - 0008E9EB19F1AD9B0091588D /* gamedef.c in Sources */, - 20F7124D1C6C19E5006B68D0 /* screentext.c in Sources */, - 0008EA0219F1AD9B0091588D /* soundsdyn.c in Sources */, - 2038AEA01A8F12B60093B7B2 /* animsounds.c in Sources */, - 0008E9EF19F1AD9B0091588D /* gamevars.c in Sources */, - 0008E9EC19F1AD9B0091588D /* gameexec.c in Sources */, - 20F712511C6C19F4006B68D0 /* sbar.c in Sources */, - 20E16CE11C7022C300EE8446 /* cmdline.c in Sources */, - 0008E9FB19F1AD9B0091588D /* rev.c in Sources */, - 0008E9EA19F1AD9B0091588D /* game.c in Sources */, - 0008EA0719F1ADC90091588D /* common.c in Sources */, - 0008E9E619F1AD9B0091588D /* animvpx.c in Sources */, - 0008E9F619F1AD9B0091588D /* net.c in Sources */, - 0008E9F219F1AD9B0091588D /* grpscan.c in Sources */, - 0008EA0119F1AD9B0091588D /* sounds.c in Sources */, - 0008E9E419F1AD9B0091588D /* actors.c in Sources */, - 0008EA0319F1AD9B0091588D /* startosx.game.m in Sources */, - 0008E9ED19F1AD9B0091588D /* GameListSource.game.m in Sources */, - 0008E9F319F1AD9B0091588D /* input.c in Sources */, - 0008E9FE19F1AD9B0091588D /* sdlmusic.c in Sources */, - 0008E9FA19F1AD9B0091588D /* premap.c in Sources */, - 0008E9F419F1AD9B0091588D /* menus.c in Sources */, - 0008E9E519F1AD9B0091588D /* anim.c in Sources */, - 0008E9E819F1AD9B0091588D /* demo.c in Sources */, - 0008E9FC19F1AD9B0091588D /* rts.c in Sources */, - 0008E9F019F1AD9B0091588D /* global.c in Sources */, - 0008EA0019F1AD9B0091588D /* sector.c in Sources */, - 0008E9F119F1AD9B0091588D /* GrpFile.game.m in Sources */, - 0008E9F719F1AD9B0091588D /* osdcmds.c in Sources */, - 0008E9F819F1AD9B0091588D /* osdfuncs.c in Sources */, - 0008E9FD19F1AD9B0091588D /* savegame.c in Sources */, - 20F712551C6C1A07006B68D0 /* cheats.c in Sources */, - 0008E9F919F1AD9B0091588D /* player.c in Sources */, - 0008E9E719F1AD9B0091588D /* config.c in Sources */, + 0008E9F519F1AD9B0091588D /* namesdyn.cpp in Sources */, + 20E16CE81C7022DE00EE8446 /* screens.cpp in Sources */, + 0008E9EB19F1AD9B0091588D /* gamedef.cpp in Sources */, + 20F7124D1C6C19E5006B68D0 /* screentext.cpp in Sources */, + 0008EA0219F1AD9B0091588D /* soundsdyn.cpp in Sources */, + 2038AEA01A8F12B60093B7B2 /* animsounds.cpp in Sources */, + 0008E9EF19F1AD9B0091588D /* gamevars.cpp in Sources */, + 0008E9EC19F1AD9B0091588D /* gameexec.cpp in Sources */, + 20F712511C6C19F4006B68D0 /* sbar.cpp in Sources */, + 20E16CE11C7022C300EE8446 /* cmdline.cpp in Sources */, + 0008E9FB19F1AD9B0091588D /* rev.cpp in Sources */, + 0008E9EA19F1AD9B0091588D /* game.cpp in Sources */, + 0008EA0719F1ADC90091588D /* common.cpp in Sources */, + 0008E9E619F1AD9B0091588D /* animvpx.cpp in Sources */, + 0008E9F619F1AD9B0091588D /* net.cpp in Sources */, + 0008E9F219F1AD9B0091588D /* grpscan.cpp in Sources */, + 0008EA0119F1AD9B0091588D /* sounds.cpp in Sources */, + 0008E9E419F1AD9B0091588D /* actors.cpp in Sources */, + 0008EA0319F1AD9B0091588D /* startosx.game.mm in Sources */, + 0008E9ED19F1AD9B0091588D /* GameListSource.game.mm in Sources */, + 0008E9F319F1AD9B0091588D /* input.cpp in Sources */, + 0008E9FE19F1AD9B0091588D /* sdlmusic.cpp in Sources */, + 0008E9FA19F1AD9B0091588D /* premap.cpp in Sources */, + 0008E9F419F1AD9B0091588D /* menus.cpp in Sources */, + 0008E9E519F1AD9B0091588D /* anim.cpp in Sources */, + 0008E9E819F1AD9B0091588D /* demo.cpp in Sources */, + 0008E9FC19F1AD9B0091588D /* rts.cpp in Sources */, + 0008E9F019F1AD9B0091588D /* global.cpp in Sources */, + 0008EA0019F1AD9B0091588D /* sector.cpp in Sources */, + 0008E9F119F1AD9B0091588D /* GrpFile.game.mm in Sources */, + 0008E9F719F1AD9B0091588D /* osdcmds.cpp in Sources */, + 0008E9F819F1AD9B0091588D /* osdfuncs.cpp in Sources */, + 0008E9FD19F1AD9B0091588D /* savegame.cpp in Sources */, + 20F712551C6C1A07006B68D0 /* cheats.cpp in Sources */, + 0008E9F919F1AD9B0091588D /* player.cpp in Sources */, + 0008E9E719F1AD9B0091588D /* config.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1996,18 +1992,18 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0006DA2319F214A600A17995 /* grpscan.c in Sources */, - 00970E5219F210C100873EB9 /* rev.c in Sources */, - 0008EA0919F1ADD80091588D /* build.c in Sources */, - 0008EA1919F1AE820091588D /* m32exec.c in Sources */, - 0008EA0B19F1ADD80091588D /* startosx.editor.m in Sources */, - 0008EA1619F1AE820091588D /* astub.c in Sources */, - 0008EA1719F1AE820091588D /* m32common.c in Sources */, - 0008EA0A19F1ADD80091588D /* config.c in Sources */, - 0008EA0819F1ADC90091588D /* common.c in Sources */, - 0008EA1C19F1AE820091588D /* sounds_mapster32.c in Sources */, - 0008EA1B19F1AE820091588D /* m32vars.c in Sources */, - 0008EA1819F1AE820091588D /* m32def.c in Sources */, + 0006DA2319F214A600A17995 /* grpscan.cpp in Sources */, + 00970E5219F210C100873EB9 /* rev.cpp in Sources */, + 0008EA0919F1ADD80091588D /* build.cpp in Sources */, + 0008EA1919F1AE820091588D /* m32exec.cpp in Sources */, + 0008EA0B19F1ADD80091588D /* startosx.editor.mm in Sources */, + 0008EA1619F1AE820091588D /* astub.cpp in Sources */, + 0008EA1719F1AE820091588D /* m32common.cpp in Sources */, + 0008EA0A19F1ADD80091588D /* config.cpp in Sources */, + 0008EA0819F1ADC90091588D /* common.cpp in Sources */, + 0008EA1C19F1AE820091588D /* sounds_mapster32.cpp in Sources */, + 0008EA1B19F1AE820091588D /* m32vars.cpp in Sources */, + 0008EA1819F1AE820091588D /* m32def.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2015,43 +2011,43 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0008E97B19F1AC540091588D /* sdlayer.c in Sources */, - 0008E95D19F1AC540091588D /* compat.c in Sources */, - 0008E96919F1AC540091588D /* kplib.c in Sources */, - 0008E96319F1AC540091588D /* engine.c in Sources */, - 0008E99519F1AC540091588D /* voxmodel.c in Sources */, - 2044C98A1E08A66B00A8C543 /* palette.c in Sources */, - 0008E97819F1AC540091588D /* pragmas.c in Sources */, - 0008E95C19F1AC540091588D /* common.c in Sources */, - 0008E97319F1AC540091588D /* mutex.c in Sources */, - 2038AE9C1A8F126C0093B7B2 /* md4.c in Sources */, - 0008E97519F1AC540091588D /* osxbits.m in Sources */, - 20CEFB121E08A86B0077879C /* 2d.c in Sources */, - 0008E95F19F1AC540091588D /* crc32.c in Sources */, - 20CEFB181E08A8830077879C /* hash.c in Sources */, - 0008E98219F1AC540091588D /* texcache.c in Sources */, - 0008E95B19F1AC540091588D /* cache1d.c in Sources */, - 0008E97E19F1AC540091588D /* smalltextfont.c in Sources */, - 0008E97619F1AC540091588D /* polymer.c in Sources */, - 0008E97219F1AC540091588D /* mmulti_null.c in Sources */, - 2044C9991E08A72200A8C543 /* mhk.c in Sources */, - 2044C9901E08A6BC00A8C543 /* screenshot.c in Sources */, - 00970E3419F207F000873EB9 /* a-c.c in Sources */, - 0008E98319F1AC540091588D /* textfont.c in Sources */, - 0008E96D19F1AC540091588D /* mdsprite.c in Sources */, - 0008E96019F1AC540091588D /* defs.c in Sources */, - 2044C99C1E08A74100A8C543 /* tiles.c in Sources */, - 0008E95919F1AC540091588D /* baselayer.c in Sources */, + 0008E97B19F1AC540091588D /* sdlayer.cpp in Sources */, + 0008E95D19F1AC540091588D /* compat.cpp in Sources */, + 0008E96919F1AC540091588D /* kplib.cpp in Sources */, + 0008E96319F1AC540091588D /* engine.cpp in Sources */, + 0008E99519F1AC540091588D /* voxmodel.cpp in Sources */, + 2044C98A1E08A66B00A8C543 /* palette.cpp in Sources */, + 0008E97819F1AC540091588D /* pragmas.cpp in Sources */, + 0008E95C19F1AC540091588D /* common.cpp in Sources */, + 0008E97319F1AC540091588D /* mutex.cpp in Sources */, + 2038AE9C1A8F126C0093B7B2 /* md4.cpp in Sources */, + 0008E97519F1AC540091588D /* osxbits.mm in Sources */, + 20CEFB121E08A86B0077879C /* 2d.cpp in Sources */, + 0008E95F19F1AC540091588D /* crc32.cpp in Sources */, + 20CEFB181E08A8830077879C /* hash.cpp in Sources */, + 0008E98219F1AC540091588D /* texcache.cpp in Sources */, + 0008E95B19F1AC540091588D /* cache1d.cpp in Sources */, + 0008E97E19F1AC540091588D /* smalltextfont.cpp in Sources */, + 0008E97619F1AC540091588D /* polymer.cpp in Sources */, + 0008E97219F1AC540091588D /* mmulti_null.cpp in Sources */, + 2044C9991E08A72200A8C543 /* mhk.cpp in Sources */, + 2044C9901E08A6BC00A8C543 /* screenshot.cpp in Sources */, + 00970E3419F207F000873EB9 /* a-c.cpp in Sources */, + 0008E98319F1AC540091588D /* textfont.cpp in Sources */, + 0008E96D19F1AC540091588D /* mdsprite.cpp in Sources */, + 0008E96019F1AC540091588D /* defs.cpp in Sources */, + 2044C99C1E08A74100A8C543 /* tiles.cpp in Sources */, + 0008E95919F1AC540091588D /* baselayer.cpp in Sources */, 0008E99819F1AC540091588D /* xxhash.c in Sources */, - 0008E97A19F1AC540091588D /* scriptfile.c in Sources */, - 0008E97719F1AC540091588D /* polymost.c in Sources */, - 0008E96819F1AC540091588D /* hightile.c in Sources */, - 0008E96119F1AC540091588D /* dxtfilter.c in Sources */, + 0008E97A19F1AC540091588D /* scriptfile.cpp in Sources */, + 0008E97719F1AC540091588D /* polymost.cpp in Sources */, + 0008E96819F1AC540091588D /* hightile.cpp in Sources */, + 0008E96119F1AC540091588D /* dxtfilter.cpp in Sources */, 0008E96B19F1AC540091588D /* lz4.c in Sources */, - 0008E97419F1AC540091588D /* osd.c in Sources */, - 20FD1D511C44E4E700C2E553 /* colmatch.c in Sources */, - 0008E96619F1AC540091588D /* glbuild.c in Sources */, - 2044C98D1E08A69700A8C543 /* clip.c in Sources */, + 0008E97419F1AC540091588D /* osd.cpp in Sources */, + 20FD1D511C44E4E700C2E553 /* colmatch.cpp in Sources */, + 0008E96619F1AC540091588D /* glbuild.cpp in Sources */, + 2044C98D1E08A69700A8C543 /* clip.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2059,13 +2055,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0008E73F19F1ABB80091588D /* keyboard.c in Sources */, - 0008E73719F1ABB80091588D /* animlib.c in Sources */, - 0008E73919F1ABB80091588D /* control.c in Sources */, - 0008E74519F1ABB80091588D /* scriplib.c in Sources */, - 0008E74319F1ABB80091588D /* mouse.c in Sources */, - 0008E73B19F1ABB80091588D /* file_lib.c in Sources */, - 0008E73D19F1ABB80091588D /* joystick.c in Sources */, + 0008E73F19F1ABB80091588D /* keyboard.cpp in Sources */, + 0008E73719F1ABB80091588D /* animlib.cpp in Sources */, + 0008E73919F1ABB80091588D /* control.cpp in Sources */, + 0008E74519F1ABB80091588D /* scriplib.cpp in Sources */, + 0008E73B19F1ABB80091588D /* file_lib.cpp in Sources */, + 0008E73D19F1ABB80091588D /* joystick.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2073,19 +2068,19 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0008E6F719F1AAFF0091588D /* fx_man.c in Sources */, - 0008E6F619F1AAFF0091588D /* formats.c in Sources */, - 0008E6F519F1AAFF0091588D /* flac.c in Sources */, - 0008E6FB19F1AAFF0091588D /* mixst.c in Sources */, - 0008E70119F1AAFF0091588D /* xa.c in Sources */, - 20CEFB1B1E08A8CB0077879C /* xmp.c in Sources */, - 0008E6FC19F1AAFF0091588D /* multivoc.c in Sources */, - 0008E6FE19F1AAFF0091588D /* pitch.c in Sources */, - 0008E6F119F1AAFF0091588D /* driver_sdl.c in Sources */, - 0008E6FA19F1AAFF0091588D /* mix.c in Sources */, - 0008E6F319F1AAFF0091588D /* drivers.c in Sources */, - 00970E5019F2108600873EB9 /* driver_nosound.c in Sources */, - 0008E70019F1AAFF0091588D /* vorbis.c in Sources */, + 0008E6F719F1AAFF0091588D /* fx_man.cpp in Sources */, + 0008E6F619F1AAFF0091588D /* formats.cpp in Sources */, + 0008E6F519F1AAFF0091588D /* flac.cpp in Sources */, + 0008E6FB19F1AAFF0091588D /* mixst.cpp in Sources */, + 0008E70119F1AAFF0091588D /* xa.cpp in Sources */, + 20CEFB1B1E08A8CB0077879C /* xmp.cpp in Sources */, + 0008E6FC19F1AAFF0091588D /* multivoc.cpp in Sources */, + 0008E6FE19F1AAFF0091588D /* pitch.cpp in Sources */, + 0008E6F119F1AAFF0091588D /* driver_sdl.cpp in Sources */, + 0008E6FA19F1AAFF0091588D /* mix.cpp in Sources */, + 0008E6F319F1AAFF0091588D /* drivers.cpp in Sources */, + 00970E5019F2108600873EB9 /* driver_nosound.cpp in Sources */, + 0008E70019F1AAFF0091588D /* vorbis.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2109,38 +2104,38 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 000C48A319F35601006E6B52 /* global.c in Sources */, - 20E16CE21C7022C300EE8446 /* cmdline.c in Sources */, - 000C489B19F35601006E6B52 /* anim.c in Sources */, - 000C48B319F35601006E6B52 /* sounds.c in Sources */, - 000C48AE19F35601006E6B52 /* rev.c in Sources */, - 000C48B419F35601006E6B52 /* soundsdyn.c in Sources */, - 000C48A519F35601006E6B52 /* grpscan.c in Sources */, - 000C48B119F35601006E6B52 /* sdlmusic.c in Sources */, - 000C48AB19F35601006E6B52 /* osdfuncs.c in Sources */, - 000C489F19F35601006E6B52 /* gamedef.c in Sources */, - 000C48A019F35601006E6B52 /* gameexec.c in Sources */, - 000C48AD19F35601006E6B52 /* premap.c in Sources */, - 000C489E19F35601006E6B52 /* game.c in Sources */, - 20E16CE91C7022DE00EE8446 /* screens.c in Sources */, - 000C48AC19F35601006E6B52 /* player.c in Sources */, - 000C489C19F35601006E6B52 /* config.c in Sources */, - 000C48A619F35601006E6B52 /* input.c in Sources */, - 000C48F219F35F42006E6B52 /* gamevars.c in Sources */, - 20F712521C6C19F4006B68D0 /* sbar.c in Sources */, - 000C489919F35601006E6B52 /* common.c in Sources */, - 000C48AF19F35601006E6B52 /* rts.c in Sources */, - 20F7124E1C6C19E5006B68D0 /* screentext.c in Sources */, - 000C489D19F35601006E6B52 /* demo.c in Sources */, - 20F712561C6C1A07006B68D0 /* cheats.c in Sources */, - 000C48A719F35601006E6B52 /* menus.c in Sources */, - 2038AEA11A8F12B60093B7B2 /* animsounds.c in Sources */, - 000C48A919F35601006E6B52 /* net.c in Sources */, - 000C48A819F35601006E6B52 /* namesdyn.c in Sources */, - 000C48B219F35601006E6B52 /* sector.c in Sources */, - 000C48AA19F35601006E6B52 /* osdcmds.c in Sources */, - 000C489A19F35601006E6B52 /* actors.c in Sources */, - 000C48B019F35601006E6B52 /* savegame.c in Sources */, + 000C48A319F35601006E6B52 /* global.cpp in Sources */, + 20E16CE21C7022C300EE8446 /* cmdline.cpp in Sources */, + 000C489B19F35601006E6B52 /* anim.cpp in Sources */, + 000C48B319F35601006E6B52 /* sounds.cpp in Sources */, + 000C48AE19F35601006E6B52 /* rev.cpp in Sources */, + 000C48B419F35601006E6B52 /* soundsdyn.cpp in Sources */, + 000C48A519F35601006E6B52 /* grpscan.cpp in Sources */, + 000C48B119F35601006E6B52 /* sdlmusic.cpp in Sources */, + 000C48AB19F35601006E6B52 /* osdfuncs.cpp in Sources */, + 000C489F19F35601006E6B52 /* gamedef.cpp in Sources */, + 000C48A019F35601006E6B52 /* gameexec.cpp in Sources */, + 000C48AD19F35601006E6B52 /* premap.cpp in Sources */, + 000C489E19F35601006E6B52 /* game.cpp in Sources */, + 20E16CE91C7022DE00EE8446 /* screens.cpp in Sources */, + 000C48AC19F35601006E6B52 /* player.cpp in Sources */, + 000C489C19F35601006E6B52 /* config.cpp in Sources */, + 000C48A619F35601006E6B52 /* input.cpp in Sources */, + 000C48F219F35F42006E6B52 /* gamevars.cpp in Sources */, + 20F712521C6C19F4006B68D0 /* sbar.cpp in Sources */, + 000C489919F35601006E6B52 /* common.cpp in Sources */, + 000C48AF19F35601006E6B52 /* rts.cpp in Sources */, + 20F7124E1C6C19E5006B68D0 /* screentext.cpp in Sources */, + 000C489D19F35601006E6B52 /* demo.cpp in Sources */, + 20F712561C6C1A07006B68D0 /* cheats.cpp in Sources */, + 000C48A719F35601006E6B52 /* menus.cpp in Sources */, + 2038AEA11A8F12B60093B7B2 /* animsounds.cpp in Sources */, + 000C48A919F35601006E6B52 /* net.cpp in Sources */, + 000C48A819F35601006E6B52 /* namesdyn.cpp in Sources */, + 000C48B219F35601006E6B52 /* sector.cpp in Sources */, + 000C48AA19F35601006E6B52 /* osdcmds.cpp in Sources */, + 000C489A19F35601006E6B52 /* actors.cpp in Sources */, + 000C48B019F35601006E6B52 /* savegame.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2148,45 +2143,45 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0013828B19F361B60007DA6C /* sdlayer.c in Sources */, - 0013828C19F361B60007DA6C /* compat.c in Sources */, - 0013828D19F361B60007DA6C /* kplib.c in Sources */, - 0013828E19F361B60007DA6C /* engine.c in Sources */, - 0013828F19F361B60007DA6C /* voxmodel.c in Sources */, - 0013829119F361B60007DA6C /* pragmas.c in Sources */, + 0013828B19F361B60007DA6C /* sdlayer.cpp in Sources */, + 0013828C19F361B60007DA6C /* compat.cpp in Sources */, + 0013828D19F361B60007DA6C /* kplib.cpp in Sources */, + 0013828E19F361B60007DA6C /* engine.cpp in Sources */, + 0013828F19F361B60007DA6C /* voxmodel.cpp in Sources */, + 0013829119F361B60007DA6C /* pragmas.cpp in Sources */, 206B3A0C1B074F6400E5DBD0 /* jwzgles.c in Sources */, - 20CEFB131E08A86B0077879C /* 2d.c in Sources */, - 0013829219F361B60007DA6C /* common.c in Sources */, - 2044C98B1E08A66B00A8C543 /* palette.c in Sources */, - 0013829319F361B60007DA6C /* mutex.c in Sources */, - 0013829519F361B60007DA6C /* crc32.c in Sources */, - 20FD1D521C44E4E700C2E553 /* colmatch.c in Sources */, - 20CEFB191E08A8830077879C /* hash.c in Sources */, - 0013829719F361B60007DA6C /* texcache.c in Sources */, - 0013829819F361B60007DA6C /* cache1d.c in Sources */, - 0013829919F361B60007DA6C /* smalltextfont.c in Sources */, - 0013829A19F361B60007DA6C /* polymer.c in Sources */, - 0013829B19F361B60007DA6C /* mmulti_null.c in Sources */, - 0013829C19F361B60007DA6C /* a-c.c in Sources */, - 2038AE9D1A8F126C0093B7B2 /* md4.c in Sources */, - 0013829D19F361B60007DA6C /* textfont.c in Sources */, + 20CEFB131E08A86B0077879C /* 2d.cpp in Sources */, + 0013829219F361B60007DA6C /* common.cpp in Sources */, + 2044C98B1E08A66B00A8C543 /* palette.cpp in Sources */, + 0013829319F361B60007DA6C /* mutex.cpp in Sources */, + 0013829519F361B60007DA6C /* crc32.cpp in Sources */, + 20FD1D521C44E4E700C2E553 /* colmatch.cpp in Sources */, + 20CEFB191E08A8830077879C /* hash.cpp in Sources */, + 0013829719F361B60007DA6C /* texcache.cpp in Sources */, + 0013829819F361B60007DA6C /* cache1d.cpp in Sources */, + 0013829919F361B60007DA6C /* smalltextfont.cpp in Sources */, + 0013829A19F361B60007DA6C /* polymer.cpp in Sources */, + 0013829B19F361B60007DA6C /* mmulti_null.cpp in Sources */, + 0013829C19F361B60007DA6C /* a-c.cpp in Sources */, + 2038AE9D1A8F126C0093B7B2 /* md4.cpp in Sources */, + 0013829D19F361B60007DA6C /* textfont.cpp in Sources */, 204D6B611C98973F001FA505 /* ProcessRGB.cpp in Sources */, - 0013829E19F361B60007DA6C /* mdsprite.c in Sources */, - 0013829F19F361B60007DA6C /* defs.c in Sources */, - 2044C9911E08A6BC00A8C543 /* screenshot.c in Sources */, + 0013829E19F361B60007DA6C /* mdsprite.cpp in Sources */, + 0013829F19F361B60007DA6C /* defs.cpp in Sources */, + 2044C9911E08A6BC00A8C543 /* screenshot.cpp in Sources */, 204D6B631C98973F001FA505 /* Tables.cpp in Sources */, - 001382A019F361B60007DA6C /* baselayer.c in Sources */, - 2044C98E1E08A69700A8C543 /* clip.c in Sources */, + 001382A019F361B60007DA6C /* baselayer.cpp in Sources */, + 2044C98E1E08A69700A8C543 /* clip.cpp in Sources */, 001382A119F361B60007DA6C /* xxhash.c in Sources */, - 2044C99A1E08A72200A8C543 /* mhk.c in Sources */, - 001382A219F361B60007DA6C /* scriptfile.c in Sources */, - 001382A319F361B60007DA6C /* polymost.c in Sources */, - 001382A419F361B60007DA6C /* hightile.c in Sources */, - 001382A519F361B60007DA6C /* dxtfilter.c in Sources */, + 2044C99A1E08A72200A8C543 /* mhk.cpp in Sources */, + 001382A219F361B60007DA6C /* scriptfile.cpp in Sources */, + 001382A319F361B60007DA6C /* polymost.cpp in Sources */, + 001382A419F361B60007DA6C /* hightile.cpp in Sources */, + 001382A519F361B60007DA6C /* dxtfilter.cpp in Sources */, 001382A619F361B60007DA6C /* lz4.c in Sources */, - 2044C99D1E08A74100A8C543 /* tiles.c in Sources */, - 001382A719F361B60007DA6C /* osd.c in Sources */, - 001382A819F361B60007DA6C /* glbuild.c in Sources */, + 2044C99D1E08A74100A8C543 /* tiles.cpp in Sources */, + 001382A719F361B60007DA6C /* osd.cpp in Sources */, + 001382A819F361B60007DA6C /* glbuild.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2194,13 +2189,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 001382E119F361B80007DA6C /* keyboard.c in Sources */, - 001382E219F361B80007DA6C /* animlib.c in Sources */, - 001382E319F361B80007DA6C /* control.c in Sources */, - 001382E419F361B80007DA6C /* scriplib.c in Sources */, - 001382E619F361B80007DA6C /* mouse.c in Sources */, - 001382E719F361B80007DA6C /* file_lib.c in Sources */, - 001382E819F361B80007DA6C /* joystick.c in Sources */, + 001382E119F361B80007DA6C /* keyboard.cpp in Sources */, + 001382E219F361B80007DA6C /* animlib.cpp in Sources */, + 001382E319F361B80007DA6C /* control.cpp in Sources */, + 001382E419F361B80007DA6C /* scriplib.cpp in Sources */, + 001382E719F361B80007DA6C /* file_lib.cpp in Sources */, + 001382E819F361B80007DA6C /* joystick.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2208,19 +2202,19 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 001382FB19F361BB0007DA6C /* fx_man.c in Sources */, - 001382FC19F361BB0007DA6C /* formats.c in Sources */, - 001382FD19F361BB0007DA6C /* flac.c in Sources */, - 00CAC13319F4E0EA00317AE6 /* driver_sdl.c in Sources */, - 001382FE19F361BB0007DA6C /* mixst.c in Sources */, - 20CEFB1C1E08A8CB0077879C /* xmp.c in Sources */, - 001382FF19F361BB0007DA6C /* xa.c in Sources */, - 0013830019F361BB0007DA6C /* multivoc.c in Sources */, - 0013830119F361BB0007DA6C /* pitch.c in Sources */, - 0013830319F361BB0007DA6C /* mix.c in Sources */, - 0013830419F361BB0007DA6C /* drivers.c in Sources */, - 0013830519F361BB0007DA6C /* driver_nosound.c in Sources */, - 0013830619F361BB0007DA6C /* vorbis.c in Sources */, + 001382FB19F361BB0007DA6C /* fx_man.cpp in Sources */, + 001382FC19F361BB0007DA6C /* formats.cpp in Sources */, + 001382FD19F361BB0007DA6C /* flac.cpp in Sources */, + 00CAC13319F4E0EA00317AE6 /* driver_sdl.cpp in Sources */, + 001382FE19F361BB0007DA6C /* mixst.cpp in Sources */, + 20CEFB1C1E08A8CB0077879C /* xmp.cpp in Sources */, + 001382FF19F361BB0007DA6C /* xa.cpp in Sources */, + 0013830019F361BB0007DA6C /* multivoc.cpp in Sources */, + 0013830119F361BB0007DA6C /* pitch.cpp in Sources */, + 0013830319F361BB0007DA6C /* mix.cpp in Sources */, + 0013830419F361BB0007DA6C /* drivers.cpp in Sources */, + 0013830519F361BB0007DA6C /* driver_nosound.cpp in Sources */, + 0013830619F361BB0007DA6C /* vorbis.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3727,8 +3721,8 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - ../../../../../SDL/include, - ../../../../../SDL_mixer, + ../../../SDL/include, + ../../../SDL_mixer, ); INFOPLIST_FILE = iOS/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -3838,8 +3832,8 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - ../../../../../SDL/include, - ../../../../../SDL_mixer, + ../../../SDL/include, + ../../../SDL_mixer, ); INFOPLIST_FILE = iOS/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -3949,8 +3943,8 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - ../../../../../SDL/include, - ../../../../../SDL_mixer, + ../../../SDL/include, + ../../../SDL_mixer, ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = ( @@ -4055,8 +4049,8 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - ../../../../../SDL/include, - ../../../../../SDL_mixer, + ../../../SDL/include, + ../../../SDL_mixer, ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = ( @@ -4165,8 +4159,8 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - ../../../../../SDL/include, - ../../../../../SDL_mixer, + ../../../SDL/include, + ../../../SDL_mixer, ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = /usr/local/lib; @@ -4268,8 +4262,8 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - ../../../../../SDL/include, - ../../../../../SDL_mixer, + ../../../SDL/include, + ../../../SDL_mixer, ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = /usr/local/lib; @@ -4375,8 +4369,8 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - ../../../../../SDL/include, - ../../../../../SDL_mixer, + ../../../SDL/include, + ../../../SDL_mixer, ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = /usr/local/lib; @@ -4478,8 +4472,8 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - ../../../../../SDL/include, - ../../../../../SDL_mixer, + ../../../SDL/include, + ../../../SDL_mixer, ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = /usr/local/lib; diff --git a/platform/Apple/iOS/Images.xcassets/AppIcon.appiconset/Contents.json b/platform/Apple/iOS/Images.xcassets/AppIcon.appiconset/Contents.json index eeea76c2d..1d060ed28 100644 --- a/platform/Apple/iOS/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/platform/Apple/iOS/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "29x29", @@ -30,6 +40,16 @@ "size" : "60x60", "scale" : "3x" }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, { "idiom" : "ipad", "size" : "29x29", diff --git a/platform/Windows/eduke32.sln b/platform/Windows/eduke32.sln index 83cecc7c6..b3f3b8e6b 100644 --- a/platform/Windows/eduke32.sln +++ b/platform/Windows/eduke32.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eduke32", "eduke32.vcxproj", "{8E7A6179-0B72-4073-8A4C-E8682D481DAE}" EndProject @@ -11,9 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProjectSection EndProject Global - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution SDL Debug|32-bit = SDL Debug|32-bit SDL Debug|64-bit = SDL Debug|64-bit diff --git a/platform/Windows/eduke32.vcxproj b/platform/Windows/eduke32.vcxproj index 199ef567a..37e4ee616 100644 --- a/platform/Windows/eduke32.vcxproj +++ b/platform/Windows/eduke32.vcxproj @@ -53,374 +53,372 @@ v140 .\ .\ - $(NMakeIncludeSearchPath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;platform\windows\include - nmake /f Makefile.msvc DEBUG=1 WINBITS=32 - nmake /f Makefile.msvc veryclean all DEBUG=1 WINBITS=32 - nmake /f Makefile.msvc veryclean DEBUG=1 WINBITS=32 + $(NMakeIncludeSearchPath);..\..\source\build\include;..\..\source\mact\include;..\..\source\audiolib\include;..\..\source\enet\include;..\..\platform\windows\include + nmake /f msvc.mak DEBUG=1 WINBITS=32 + nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=32 + nmake /f msvc.mak veryclean DEBUG=1 WINBITS=32 USE_OPENGL;POLYMER - nmake /f Makefile.msvc WINBITS=32 - nmake /f Makefile.msvc veryclean all WINBITS=32 - nmake /f Makefile.msvc veryclean WINBITS=32 + nmake /f msvc.mak WINBITS=32 + nmake /f msvc.mak veryclean all WINBITS=32 + nmake /f msvc.mak veryclean WINBITS=32 USE_OPENGL;POLYMER - nmake /f Makefile.msvc DEBUG=1 WINBITS=64 - nmake /f Makefile.msvc veryclean all DEBUG=1 WINBITS=64 - nmake /f Makefile.msvc veryclean DEBUG=1 WINBITS=64 + nmake /f msvc.mak DEBUG=1 WINBITS=64 + nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=64 + nmake /f msvc.mak veryclean DEBUG=1 WINBITS=64 USE_OPENGL;POLYMER;NOASM - nmake /f Makefile.msvc WINBITS=64 - nmake /f Makefile.msvc veryclean all WINBITS=64 - nmake /f Makefile.msvc veryclean WINBITS=64 + nmake /f msvc.mak WINBITS=64 + nmake /f msvc.mak veryclean all WINBITS=64 + nmake /f msvc.mak veryclean WINBITS=64 USE_OPENGL;POLYMER;NOASM - nmake /f Makefile.msvc DEBUG=1 WINBITS=32 RENDERTYPE=SDL - nmake /f Makefile.msvc veryclean all DEBUG=1 WINBITS=32 RENDERTYPE=SDL - nmake /f Makefile.msvc veryclean DEBUG=1 WINBITS=32 RENDERTYPE=SDL + nmake /f msvc.mak DEBUG=1 WINBITS=32 RENDERTYPE=SDL + nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=32 RENDERTYPE=SDL + nmake /f msvc.mak veryclean DEBUG=1 WINBITS=32 RENDERTYPE=SDL USE_OPENGL;POLYMER;SDL_USEFOLDER;SDL_TARGET=2 - nmake /f Makefile.msvc WINBITS=32 RENDERTYPE=SDL - nmake /f Makefile.msvc veryclean all WINBITS=32 RENDERTYPE=SDL - nmake /f Makefile.msvc veryclean WINBITS=32 RENDERTYPE=SDL + nmake /f msvc.mak WINBITS=32 RENDERTYPE=SDL + nmake /f msvc.mak veryclean all WINBITS=32 RENDERTYPE=SDL + nmake /f msvc.mak veryclean WINBITS=32 RENDERTYPE=SDL USE_OPENGL;POLYMER;SDL_USEFOLDER;SDL_TARGET=2 - nmake /f Makefile.msvc DEBUG=1 WINBITS=64 RENDERTYPE=SDL - nmake /f Makefile.msvc veryclean all DEBUG=1 WINBITS=64 RENDERTYPE=SDL - nmake /f Makefile.msvc veryclean DEBUG=1 WINBITS=64 RENDERTYPE=SDL + nmake /f msvc.mak DEBUG=1 WINBITS=64 RENDERTYPE=SDL + nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=64 RENDERTYPE=SDL + nmake /f msvc.mak veryclean DEBUG=1 WINBITS=64 RENDERTYPE=SDL USE_OPENGL;POLYMER;NOASM;HAVE_INTTYPES;SDL_USEFOLDER;SDL_TARGET=2 - nmake /f Makefile.msvc WINBITS=64 RENDERTYPE=SDL - nmake /f Makefile.msvc veryclean all WINBITS=64 RENDERTYPE=SDL - nmake /f Makefile.msvc veryclean WINBITS=64 RENDERTYPE=SDL + nmake /f msvc.mak WINBITS=64 RENDERTYPE=SDL + nmake /f msvc.mak veryclean all WINBITS=64 RENDERTYPE=SDL + nmake /f msvc.mak veryclean WINBITS=64 RENDERTYPE=SDL USE_OPENGL;POLYMER;NOASM;SDL_USEFOLDER;SDL_TARGET=2 - $(VC_IncludePath);$(WindowsSDK_IncludePath);build\include;source\jmact;source\jaudiolib\include;source\enet\include; + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\source\build\include;..\..\source\mact\include;..\..\source\audiolib\include;..\..\source\enet\include; - $(VC_IncludePath);$(WindowsSDK_IncludePath);build\include;source\jmact;source\jaudiolib\include;source\enet\include; + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\source\build\include;..\..\source\mact\include;..\..\source\audiolib\include;..\..\source\enet\include; - $(VC_IncludePath);$(WindowsSDK_IncludePath);build\include;source\jmact;source\jaudiolib\include;source\enet\include; + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\source\build\include;..\..\source\mact\include;..\..\source\audiolib\include;..\..\source\enet\include; - $(VC_IncludePath);$(WindowsSDK_IncludePath);build\include;source\jmact;source\jaudiolib\include;source\enet\include; + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\source\build\include;..\..\source\mact\include;..\..\source\audiolib\include;..\..\source\enet\include; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/Windows/eduke32.vcxproj.filters b/platform/Windows/eduke32.vcxproj.filters index 12b132804..c6ceca690 100644 --- a/platform/Windows/eduke32.vcxproj.filters +++ b/platform/Windows/eduke32.vcxproj.filters @@ -10,13 +10,13 @@ {84e51a60-037b-40c6-933a-7001d46906ab} - + {eb6a8145-04f6-4b81-b8eb-508836cfdc91} - + {7f1918c8-1b71-43db-b2af-aefaf13d21ac} - + {447f3e7e-c01b-4ec3-8427-36441da24049} @@ -40,13 +40,13 @@ {82d4000f-cd8c-4737-88dc-4ada5775a68e} - + {65030203-c837-4739-a552-281c7535372f} - + {607ab16a-c3a5-4dad-b6ba-3393e6309d23} - + {8a6aad55-a3bc-4e4f-a61d-4652c29d8b92} @@ -84,959 +84,953 @@ - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers\MSVC - + build\headers\MSVC - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - - jaudiolib\headers + + audiolib\headers - - jaudiolib\headers + + audiolib\headers - - jaudiolib\headers + + audiolib\headers - - jaudiolib\headers + + audiolib\headers - - jaudiolib\headers + + audiolib\headers - - jaudiolib\headers + + audiolib\headers - - jaudiolib\headers + + audiolib\headers - - jaudiolib\headers + + audiolib\headers - - jmact\headers + + mact\headers - - jmact\headers + + mact\headers - - jmact\headers + + mact\headers - - jmact\headers + + mact\headers - - jmact\headers + + mact\headers - - jmact\headers + + mact\headers - - jmact\headers + + mact\headers - - jmact\headers + + mact\headers - + enet\headers - + enet\headers - + enet\headers - + enet\headers - + enet\headers - + enet\headers - + enet\headers - + enet\headers - + enet\headers - + build\headers - + build\headers - + build\headers - + build\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers\editor - + eduke32\headers\editor - + eduke32\headers\editor - + eduke32\headers - + build\headers - + build\headers - + build\headers - + + build\headers + + eduke32\headers - - eduke32\headers - - + build\headers - + build\headers - + build\headers - + build\headers - + eduke32\source\lunatic\headers - + eduke32\source\lunatic\headers - + eduke32\headers\android - + eduke32\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + build\headers - + eduke32\headers - + touchcontrols\headers - + touchcontrols\headers - + touchcontrols\headers - + touchcontrols\headers - + touchcontrols\headers - + touchcontrols\headers - + touchcontrols\headers - + touchcontrols\headers - + touchcontrols\headers - + touchcontrols\headers - + touchcontrols\headers - + touchcontrols\headers - + touchcontrols\headers - + touchcontrols\headers - + touchcontrols\headers - + build\headers - + build\headers - - jaudiolib\headers + + audiolib\headers - + build\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - - eduke32\source\editor - - + eduke32\headers - + eduke32\headers - + eduke32\headers - + eduke32\headers - + + eduke32\headers + + build\headers - + build\headers - + build\headers - + build\headers - - jaudiolib\headers + + audiolib\headers - + eduke32\headers\editor - + build\headers - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - - jaudiolib\source + + audiolib\source - - jaudiolib\source + + audiolib\source - - jaudiolib\source + + audiolib\source - - jaudiolib\source + + audiolib\source - - jaudiolib\source + + audiolib\source - - jaudiolib\source + + audiolib\source - - jaudiolib\source + + audiolib\source - - jaudiolib\source + + audiolib\source - - jaudiolib\source + + audiolib\source - - jaudiolib\source + + audiolib\source - - jmact\source + + mact\source - - jmact\source + + mact\source - - jmact\source + + mact\source - - jmact\source + + mact\source - - jmact\source + + mact\source - + enet\source - + enet\source - + enet\source - + enet\source - + enet\source - + enet\source - + enet\source - + enet\source - + build\source - + build\source - + eduke32\source - + eduke32\source - + eduke32\source\editor - + eduke32\source\editor - + eduke32\source\editor - + eduke32\source\editor - + eduke32\source\editor - + eduke32\source\editor - + eduke32\source - - eduke32\source + + build\source - + enet\source - + eduke32\source - + build\source - + build\source - + build\source - + eduke32\source\lunatic\source - + eduke32\source\lunatic\source - + eduke32\source\android - - eduke32\source\android - - + build\source - + eduke32\source\editor - + build\source - + eduke32\source - + touchcontrols\source - + touchcontrols\source - + touchcontrols\source - + touchcontrols\source - + touchcontrols\source - + touchcontrols\source - + touchcontrols\source - + touchcontrols\source - + touchcontrols\source - + touchcontrols\source - + touchcontrols\source - + touchcontrols\source - + touchcontrols\source - + build\source - + build\source - - jaudiolib\source + + audiolib\source - - jaudiolib\source + + audiolib\source - - jaudiolib\source + + audiolib\source - + build\source - + build\source - + build\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + eduke32\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + build\source - + eduke32 - - build - - + eduke32\source\lunatic - + eduke32\source\lunatic - + eduke32\source\lunatic - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua - + eduke32\source\lunatic\lua diff --git a/platform/Windows/msvc.mak b/platform/Windows/msvc.mak index a4e3fbff9..45921614f 100644 --- a/platform/Windows/msvc.mak +++ b/platform/Windows/msvc.mak @@ -1,29 +1,37 @@ # EDuke32 Makefile for Microsoft NMake -obj=obj +root=..\..\ -ENGINE_ROOT=build +obj=$(root)\obj +source=$(root)\source + +ENGINE=build +ENGINE_ROOT=$(source)\$(ENGINE) ENGINE_SRC=$(ENGINE_ROOT)\src ENGINE_INC=$(ENGINE_ROOT)\include -ENGINE_OBJ=$(ENGINE_ROOT)\$(obj) +ENGINE_OBJ=$(obj)\$(ENGINE) -DUKE3D_SRC=source -DUKE3D_OBJ=$(DUKE3D_SRC)\$(obj) -DUKE3D_INC=$(DUKE3D_SRC) -DUKE3D_RSRC=rsrc +DUKE3D=duke3d +DUKE3D_ROOT=$(source)\$(DUKE3D) +DUKE3D_SRC=$(DUKE3D_ROOT)\src +DUKE3D_OBJ=$(obj)\$(DUKE3D) +DUKE3D_RSRC=$(DUKE3D_ROOT)\rsrc -MACT_ROOT=$(DUKE3D_SRC)\jmact -MACT_SRC=$(MACT_ROOT) -MACT_INC=$(MACT_ROOT) -MACT_OBJ=$(MACT_ROOT)\$(obj) +MACT=mact +MACT_ROOT=$(source)\$(MACT) +MACT_SRC=$(MACT_ROOT)\src +MACT_INC=$(MACT_ROOT)\include +MACT_OBJ=$(obj)\$(MACT) -AUDIOLIB_ROOT=$(DUKE3D_SRC)\jaudiolib -AUDIOLIB_OBJ=$(AUDIOLIB_ROOT)\$(obj) +AUDIOLIB=audiolib +AUDIOLIB_ROOT=$(source)\$(AUDIOLIB) +AUDIOLIB_OBJ=$(obj)\$(AUDIOLIB) AUDIOLIB_INC=$(AUDIOLIB_ROOT)\include AUDIOLIB_SRC=$(AUDIOLIB_ROOT)\src -ENET_ROOT=$(DUKE3D_SRC)\enet -ENET_OBJ=$(ENET_ROOT)\$(obj) +ENET=enet +ENET_ROOT=$(source)\$(ENET) +ENET_OBJ=$(obj)\$(ENET) ENET_INC=$(ENET_ROOT)\include ENET_SRC=$(ENET_ROOT)\src @@ -49,11 +57,8 @@ WINMACHINE=/MACHINE:X64 !endif # the WDK allows us to link against msvcrt.dll instead of msvcrxxx.dll -# this path should match build\Makefile.msvc # WDKROOT="H:\WinDDK\7600.16385.1" -PLATFORM=platform\Windows -AUDIOINC=source\jaudiolib\third-party\common -AUDIOPLATFORM=source\jaudiolib\third-party\Windows +PLATFORM=$(root)\platform\Windows !ifndef RENDERTYPE RENDERTYPE=WIN @@ -90,9 +95,9 @@ AS=ml LINK=link /nologo /opt:ref MT=mt CFLAGS= /MT /J /nologo $(flags_cl) \ - /I$(DUKE3D_INC) /I$(ENGINE_INC)\msvc /I$(ENGINE_INC) /I$(MACT_ROOT) /I$(AUDIOLIB_ROOT)\include /I$(ENET_ROOT)\include \ + /I$(DUKE3D_SRC) /I$(ENGINE_INC)\msvc /I$(ENGINE_INC) /I$(MACT_INC) /I$(AUDIOLIB_INC) /I$(ENET_INC) \ /W2 $(ENGINEOPTS) \ - /I$(PLATFORM)\include /I$(AUDIOINC)\include /DRENDERTYPE$(RENDERTYPE)=1 /DMIXERTYPE$(MIXERTYPE)=1 /DSDL_USEFOLDER /DSDL_TARGET=2 + /I$(PLATFORM)\include /DRENDERTYPE$(RENDERTYPE)=1 /DMIXERTYPE$(MIXERTYPE)=1 /DSDL_USEFOLDER /DSDL_TARGET=2 ENET_CFLAGS=/I$(ENET_INC) /I$(ENET_SRC) AUDIOLIB_CFLAGS=/I$(AUDIOLIB_INC) /I$(AUDIOLIB_SRC) @@ -129,6 +134,7 @@ ENGINE_OBJS= \ !else $(ENGINE_OBJ)\a.$o \ !endif + $(ENGINE_OBJ)\animvpx.$o \ $(ENGINE_OBJ)\baselayer.$o \ $(ENGINE_OBJ)\cache1d.$o \ $(ENGINE_OBJ)\common.$o \ @@ -158,6 +164,7 @@ ENGINE_OBJS= \ $(ENGINE_OBJ)\mmulti_null.$o \ $(ENGINE_OBJ)\osd.$o \ $(ENGINE_OBJ)\pragmas.$o \ + $(ENGINE_OBJ)\rev.$o \ $(ENGINE_OBJ)\scriptfile.$o \ $(ENGINE_OBJ)\mutex.$o \ $(ENGINE_OBJ)\winbits.$o \ @@ -191,17 +198,17 @@ AUDIOLIB_OBJS=$(AUDIOLIB_OBJ)\drivers.$o \ $(AUDIOLIB_OBJ)\xmp.$o \ $(AUDIOLIB_OBJ)\driver_nosound.$o -MACT_OBJS=$(DUKE3D_OBJ)\file_lib.$o \ - $(DUKE3D_OBJ)\control.$o \ - $(DUKE3D_OBJ)\keyboard.$o \ - $(DUKE3D_OBJ)\joystick.$o \ - $(DUKE3D_OBJ)\scriplib.$o +MACT_OBJS=$(MACT_OBJ)\file_lib.$o \ + $(MACT_OBJ)\control.$o \ + $(MACT_OBJ)\keyboard.$o \ + $(MACT_OBJ)\joystick.$o \ + $(MACT_OBJ)\scriplib.$o \ + $(MACT_OBJ)\animlib.$o DUKE3D_OBJS=$(DUKE3D_OBJ)\game.$o \ $(DUKE3D_OBJ)\actors.$o \ $(DUKE3D_OBJ)\anim.$o \ $(DUKE3D_OBJ)\animsounds.$o \ - $(DUKE3D_OBJ)\animvpx.$o \ $(DUKE3D_OBJ)\cheats.$o \ $(DUKE3D_OBJ)\sbar.$o \ $(DUKE3D_OBJ)\screentext.$o \ @@ -221,17 +228,14 @@ DUKE3D_OBJS=$(DUKE3D_OBJ)\game.$o \ $(DUKE3D_OBJ)\premap.$o \ $(DUKE3D_OBJ)\savegame.$o \ $(DUKE3D_OBJ)\sector.$o \ - $(DUKE3D_OBJ)\rev.$o \ $(DUKE3D_OBJ)\rts.$o \ $(DUKE3D_OBJ)\config.$o \ - $(DUKE3D_OBJ)\animlib.$o\ $(DUKE3D_OBJ)\osdfuncs.$o \ $(DUKE3D_OBJ)\osdcmds.$o \ $(DUKE3D_OBJ)\grpscan.$o \ $(DUKE3D_OBJ)\winbits.$o \ $(DUKE3D_OBJ)\gameres.$(res) \ $(DUKE3D_OBJ)\startwin.game.$o \ - $(MACT_OBJS) \ $(DUKE3D_OBJ)\sounds.$o \ $(DUKE3D_OBJ)\soundsdyn.$o \ !ifdef DEBUG @@ -246,7 +250,6 @@ DUKE3D_EDITOR_OBJS=$(DUKE3D_OBJ)\astub.$o \ $(DUKE3D_OBJ)\m32vars.$o \ $(DUKE3D_OBJ)\m32exec.$o \ $(DUKE3D_OBJ)\sounds_mapster32.$o \ - $(DUKE3D_OBJ)\rev.$o \ $(DUKE3D_OBJ)\buildres.$(res) \ !ifdef DEBUG $(DUKE3D_OBJ)\mdump.$o @@ -277,6 +280,7 @@ DUKE3D_EDITOR_OBJS=$(DUKE3D_EDITOR_OBJS) $(MUSICOBJ) CHECKDIR_ENGINE=@if not exist "$(ENGINE_OBJ)" mkdir "$(ENGINE_OBJ)" CHECKDIR_DUKE3D=@if not exist "$(DUKE3D_OBJ)" mkdir "$(DUKE3D_OBJ)" CHECKDIR_ENET=@if not exist "$(ENET_OBJ)" mkdir "$(ENET_OBJ)" +CHECKDIR_MACT=@if not exist "$(MACT_OBJ)" mkdir "$(MACT_OBJ)" CHECKDIR_AUDIOLIB=@if not exist "$(AUDIOLIB_OBJ)" mkdir "$(AUDIOLIB_OBJ)" @@ -287,27 +291,11 @@ CHECKDIR_AUDIOLIB=@if not exist "$(AUDIOLIB_OBJ)" mkdir "$(AUDIOLIB_OBJ)" $(CHECKDIR_ENGINE) $(AS) /c $(ASFLAGS) /Fo$@ $< -{$(ENGINE_SRC)\util}.c{$(ENGINE_OBJ)}.$o: - $(CHECKDIR_ENGINE) - $(CC) /c $(CFLAGS) /Fo$@ $< - -{$(ENGINE_SRC)\misc}.rc{$(ENGINE_OBJ)}.$(res): - $(CHECKDIR_ENGINE) - $(RC) /i$(ENGINE_INC)\ /fo$@ /r $< - -{$(ENGINE_SRC)}.c{$(ENGINE_OBJ)}.$o: - $(CHECKDIR_ENGINE) - $(CC) /c $(CFLAGS) /Fo$@ $< - -{$(ENGINE_SRC)}.cc{$(ENGINE_OBJ)}.$o: - $(CHECKDIR_ENGINE) - $(CC) /c $(CFLAGS) /Fo$@ $< - {$(ENGINE_SRC)}.cpp{$(ENGINE_OBJ)}.$o: $(CHECKDIR_ENGINE) $(CC) /c $(CFLAGS) /Fo$@ $< -{$(ENGINE_SRC)}.cxx{$(ENGINE_OBJ)}.$o: +{$(ENGINE_SRC)}.c{$(ENGINE_OBJ)}.$o: $(CHECKDIR_ENGINE) $(CC) /c $(CFLAGS) /Fo$@ $< @@ -315,24 +303,12 @@ CHECKDIR_AUDIOLIB=@if not exist "$(AUDIOLIB_OBJ)" mkdir "$(AUDIOLIB_OBJ)" $(CHECKDIR_ENET) $(CC) /c $(CFLAGS) $(ENET_CFLAGS) /Fo$@ $< -{$(AUDIOLIB_SRC)}.c{$(AUDIOLIB_OBJ)}.$o: +{$(AUDIOLIB_SRC)}.cpp{$(AUDIOLIB_OBJ)}.$o: $(CHECKDIR_AUDIOLIB) $(CC) /c $(CFLAGS) $(AUDIOLIB_CFLAGS) /Fo$@ $< -{$(DUKE3D_SRC)\}.masm{$(DUKE3D_OBJ)\}.$o: - $(CHECKDIR_DUKE3D) - $(AS) /c $(ASFLAGS) /Fo$@ $< - -{$(MACT_ROOT)\}.c{$(DUKE3D_OBJ)\}.$o: - $(CHECKDIR_DUKE3D) - $(CC) /c $(CFLAGS) /Fo$@ $< - -{$(DUKE3D_SRC)\util}.c{$(DUKE3D_OBJ)\}.$o: - $(CHECKDIR_DUKE3D) - $(CC) /c $(CFLAGS) /Fo$@ $< - -{$(DUKE3D_SRC)\}.c{$(DUKE3D_OBJ)\}.$o: - $(CHECKDIR_DUKE3D) +{$(MACT_SRC)\}.cpp{$(MACT_OBJ)\}.$o: + $(CHECKDIR_MACT) $(CC) /c $(CFLAGS) /Fo$@ $< {$(DUKE3D_RSRC)\}.c{$(DUKE3D_OBJ)\}.$o: @@ -343,7 +319,7 @@ CHECKDIR_AUDIOLIB=@if not exist "$(AUDIOLIB_OBJ)" mkdir "$(AUDIOLIB_OBJ)" $(CHECKDIR_DUKE3D) $(CC) /c $(CFLAGS) /Fo$@ $< -{$(DUKE3D_SRC)\misc}.rc{$(DUKE3D_OBJ)\}.$(res): +{$(DUKE3D_RSRC)\}.rc{$(DUKE3D_OBJ)\}.$(res): $(CHECKDIR_DUKE3D) $(RC) /i$(ENGINE_INC)\ /i$(DUKE3D_SRC)\ /i$(DUKE3D_RSRC)\ /DPOLYMER /fo$@ /r $< @@ -351,16 +327,16 @@ CHECKDIR_AUDIOLIB=@if not exist "$(AUDIOLIB_OBJ)" mkdir "$(AUDIOLIB_OBJ)" # TARGETS all: eduke32$(EXESUFFIX) mapster32$(EXESUFFIX) -eduke32$(EXESUFFIX): $(DUKE3D_OBJS) $(ENGINE_OBJS) $(AUDIOLIB_OBJS) $(ENET_OBJS) - $(LINK) /OUT:$@ /SUBSYSTEM:WINDOWS $(WINMACHINE) /LIBPATH:$(PLATFORM)\lib$(WINLIB) /LIBPATH:$(AUDIOPLATFORM)\lib$(WINLIB) $(flags_link) /MAP $** $(LIBS) +eduke32$(EXESUFFIX): $(DUKE3D_OBJS) $(ENGINE_OBJS) $(AUDIOLIB_OBJS) $(MACT_OBJS) $(ENET_OBJS) + $(LINK) /OUT:$@ /SUBSYSTEM:WINDOWS $(WINMACHINE) /LIBPATH:$(PLATFORM)\lib$(WINLIB) $(flags_link) /MAP $** $(LIBS) $(MT) -manifest $(DUKE3D_RSRC)\manifest.game.xml -hashupdate -outputresource:$@ -out:$@.manifest mapster32$(EXESUFFIX): $(DUKE3D_EDITOR_OBJS) $(ENGINE_OBJS) $(ENGINE_EDITOR_OBJS) $(AUDIOLIB_OBJS) - $(LINK) /OUT:$@ /SUBSYSTEM:WINDOWS $(WINMACHINE) /LIBPATH:$(PLATFORM)\lib$(WINLIB) /LIBPATH:$(AUDIOPLATFORM)\lib$(WINLIB) $(flags_link) /MAP $** $(LIBS) + $(LINK) /OUT:$@ /SUBSYSTEM:WINDOWS $(WINMACHINE) /LIBPATH:$(PLATFORM)\lib$(WINLIB) $(flags_link) /MAP $** $(LIBS) $(MT) -manifest $(DUKE3D_RSRC)\manifest.build.xml -hashupdate -outputresource:$@ -out:$@.manifest -!include Makefile.deps -!include $(ENGINE_ROOT)\Makefile.deps +!include $(DUKE3D_ROOT)\Dependencies.mak +!include $(ENGINE_ROOT)\Dependencies.mak # PHONIES diff --git a/platform/synthesis.sh b/platform/synthesis.sh index 228d0814a..79e5868e6 100755 --- a/platform/synthesis.sh +++ b/platform/synthesis.sh @@ -4,17 +4,17 @@ exe=.exe # some paths -top=/var/www/synthesis/eduke32 +top=/var/www/synthesis lockfile=$top/synthesis_building source=eduke32 output=/var/www/dukeworld.duke4.net/eduke32/synthesis -make=( make SYNTHESIS=1 PLATFORM=WINDOWS CROSS='i686-w64-mingw32-' CC='i686-w64-mingw32-gcc-5.4-win32' AS='nasm' PRETTY_OUTPUT=0 SDLCONFIG='') -make64=( make SYNTHESIS=1 PLATFORM=WINDOWS CROSS='x86_64-w64-mingw32-' CC='x86_64-w64-mingw32-gcc-5.4-win32' AS='nasm' PRETTY_OUTPUT=0 SDLCONFIG='') +make=( make SYNTHESIS=1 PLATFORM=WINDOWS CROSS='i686-w64-mingw32-' CC='i686-w64-mingw32-gcc-5.4-win32' CXX='i686-w64-mingw32-g++-5.4-win32' AS='nasm' PRETTY_OUTPUT=0 SDLCONFIG='' ) +make64=( make SYNTHESIS=1 PLATFORM=WINDOWS CROSS='x86_64-w64-mingw32-' CC='x86_64-w64-mingw32-gcc-5.4-win32' CXX='x86_64-w64-mingw32-g++-5.4-win32' AS='nasm' PRETTY_OUTPUT=0 SDLCONFIG='' ) clean=veryclean -# the following file paths are relative to $source +# the following file paths are relative to $source targets=( eduke32$exe mapster32$exe ) -package=$top/$source/package/package +package=$top/package not_src_packaged=( package/debug/win32/ebacktrace1.dll package/debug/win64/ebacktrace1-64.dll ) # group that owns the resulting packages @@ -106,9 +106,9 @@ function package_game_lunatic () { # Package some Lunatic test and demo files. mkdir -p ./lunatic/test - cp $top/$source/source/lunatic/test.lua ./lunatic/ - cp $top/$source/source/lunatic/test/test_{bitar,geom,rotspr}.lua ./lunatic/test/ - cp $top/$source/source/lunatic/test/{damagehplane,delmusicsfx,helixspawner,shadexfog}.lua ./lunatic/test/ + cp $top/$source/source/duke3d/src/lunatic/test.lua ./lunatic/ + cp $top/$source/source/duke3d/src/lunatic/test/test_{bitar,geom,rotspr}.lua ./lunatic/test/ + cp $top/$source/source/duke3d/src/lunatic/test/{damagehplane,delmusicsfx,helixspawner,shadexfog}.lua ./lunatic/test/ } function package_execute () diff --git a/source/build/Dependencies.mak b/source/build/Dependencies.mak index 636782f5f..c9786d876 100644 --- a/source/build/Dependencies.mak +++ b/source/build/Dependencies.mak @@ -1,70 +1,72 @@ # Build Engine dependencies # -$(ENGINE_OBJ)/a-c.$o: $(ENGINE_SRC)/a-c.c $(ENGINE_INC)/a.h +$(ENGINE_OBJ)/a-c.$o: $(ENGINE_SRC)/a-c.cpp $(ENGINE_INC)/a.h $(ENGINE_OBJ)/a.$o: $(ENGINE_SRC)/a.$(asm) -$(ENGINE_OBJ)/baselayer.$o: $(ENGINE_SRC)/baselayer.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/osd.h -$(ENGINE_OBJ)/build.$o: $(ENGINE_SRC)/build.c $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/editor.h -$(ENGINE_OBJ)/cache1d.$o: $(ENGINE_SRC)/cache1d.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/kplib.h -$(ENGINE_OBJ)/compat.$o: $(ENGINE_SRC)/compat.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/libdivide.h -$(ENGINE_OBJ)/config.$o: $(ENGINE_SRC)/config.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/editor.h -$(ENGINE_OBJ)/crc32.$o: $(ENGINE_SRC)/crc32.c $(ENGINE_INC)/crc32.h -$(ENGINE_OBJ)/defs.$o: $(ENGINE_SRC)/defs.c $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/scriptfile.h $(ENGINE_INC)/compat.h -$(ENGINE_OBJ)/engine.$o: $(ENGINE_SRC)/engine.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/a.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/baselayer.h $(ENGINE_SRC)/engine_priv.h $(ENGINE_SRC)/engine_oldmap.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/polymer.h -$(ENGINE_OBJ)/2d.$o: $(ENGINE_SRC)/2d.c $(ENGINE_INC)/build.h -$(ENGINE_OBJ)/tiles.$o: $(ENGINE_SRC)/tiles.c $(ENGINE_INC)/build.h -$(ENGINE_OBJ)/clip.$o: $(ENGINE_SRC)/clip.c $(ENGINE_INC)/build.h $(ENGINE_INC)/clip.h -$(ENGINE_OBJ)/screenshot.$o: $(ENGINE_SRC)/screenshot.c -$(ENGINE_OBJ)/hash.$o: $(ENGINE_SRC)/hash.c $(ENGINE_INC)/hash.h -$(ENGINE_OBJ)/colmatch.$o: $(ENGINE_SRC)/colmatch.c -$(ENGINE_OBJ)/mhk.$o: $(ENGINE_SRC)/mhk.c -$(ENGINE_OBJ)/palette.$o: $(ENGINE_SRC)/palette.c $(ENGINE_INC)/palette.h -$(ENGINE_OBJ)/polymost.$o: $(ENGINE_SRC)/polymost.c $(ENGINE_INC)/lz4.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_SRC)/engine_priv.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/texcache.h -$(ENGINE_OBJ)/texcache.$o: $(ENGINE_SRC)/texcache.c $(ENGINE_INC)/texcache.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/dxtfilter.h $(ENGINE_INC)/kplib.h -$(ENGINE_OBJ)/dxtfilter.$o: $(ENGINE_SRC)/dxtfilter.c $(ENGINE_INC)/dxtfilter.h $(ENGINE_INC)/texcache.h -$(ENGINE_OBJ)/hightile.$o: $(ENGINE_SRC)/hightile.c $(ENGINE_INC)/kplib.h $(ENGINE_INC)/hightile.h -$(ENGINE_OBJ)/voxmodel.$o: $(ENGINE_SRC)/voxmodel.c $(ENGINE_SRC)/engine_priv.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/texcache.h -$(ENGINE_OBJ)/mdsprite.$o: $(ENGINE_SRC)/mdsprite.c $(ENGINE_SRC)/engine_priv.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/texcache.h -$(ENGINE_OBJ)/textfont.$o: $(ENGINE_SRC)/textfont.c -$(ENGINE_OBJ)/smalltextfont.$o: $(ENGINE_SRC)/smalltextfont.c -$(ENGINE_OBJ)/glbuild.$o: $(ENGINE_SRC)/glbuild.c $(ENGINE_INC)/glbuild.h $(ENGINE_INC)/baselayer.h -$(ENGINE_OBJ)/kplib.$o: $(ENGINE_SRC)/kplib.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/kplib.h +$(ENGINE_OBJ)/animvpx.$o: $(ENGINE_SRC)/animvpx.cpp $(ENGINE_INC)/animvpx.h $(ENGINE_INC)/glbuild.h +$(ENGINE_OBJ)/baselayer.$o: $(ENGINE_SRC)/baselayer.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/osd.h +$(ENGINE_OBJ)/build.$o: $(ENGINE_SRC)/build.cpp $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/editor.h +$(ENGINE_OBJ)/cache1d.$o: $(ENGINE_SRC)/cache1d.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/kplib.h +$(ENGINE_OBJ)/compat.$o: $(ENGINE_SRC)/compat.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/libdivide.h +$(ENGINE_OBJ)/config.$o: $(ENGINE_SRC)/config.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/editor.h +$(ENGINE_OBJ)/crc32.$o: $(ENGINE_SRC)/crc32.cpp $(ENGINE_INC)/crc32.h +$(ENGINE_OBJ)/defs.$o: $(ENGINE_SRC)/defs.cpp $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/scriptfile.h $(ENGINE_INC)/compat.h +$(ENGINE_OBJ)/engine.$o: $(ENGINE_SRC)/engine.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/a.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/baselayer.h $(ENGINE_SRC)/engine_priv.h $(ENGINE_SRC)/engine_oldmap.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/polymer.h +$(ENGINE_OBJ)/2d.$o: $(ENGINE_SRC)/2d.cpp $(ENGINE_INC)/build.h +$(ENGINE_OBJ)/tiles.$o: $(ENGINE_SRC)/tiles.cpp $(ENGINE_INC)/build.h +$(ENGINE_OBJ)/clip.$o: $(ENGINE_SRC)/clip.cpp $(ENGINE_INC)/build.h $(ENGINE_INC)/clip.h +$(ENGINE_OBJ)/screenshot.$o: $(ENGINE_SRC)/screenshot.cpp +$(ENGINE_OBJ)/hash.$o: $(ENGINE_SRC)/hash.cpp $(ENGINE_INC)/hash.h +$(ENGINE_OBJ)/colmatch.$o: $(ENGINE_SRC)/colmatch.cpp +$(ENGINE_OBJ)/mhk.$o: $(ENGINE_SRC)/mhk.cpp +$(ENGINE_OBJ)/palette.$o: $(ENGINE_SRC)/palette.cpp $(ENGINE_INC)/palette.h +$(ENGINE_OBJ)/polymost.$o: $(ENGINE_SRC)/polymost.cpp $(ENGINE_INC)/lz4.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_SRC)/engine_priv.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/texcache.h +$(ENGINE_OBJ)/texcache.$o: $(ENGINE_SRC)/texcache.cpp $(ENGINE_INC)/texcache.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/dxtfilter.h $(ENGINE_INC)/kplib.h +$(ENGINE_OBJ)/dxtfilter.$o: $(ENGINE_SRC)/dxtfilter.cpp $(ENGINE_INC)/dxtfilter.h $(ENGINE_INC)/texcache.h +$(ENGINE_OBJ)/hightile.$o: $(ENGINE_SRC)/hightile.cpp $(ENGINE_INC)/kplib.h $(ENGINE_INC)/hightile.h +$(ENGINE_OBJ)/voxmodel.$o: $(ENGINE_SRC)/voxmodel.cpp $(ENGINE_SRC)/engine_priv.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/texcache.h +$(ENGINE_OBJ)/mdsprite.$o: $(ENGINE_SRC)/mdsprite.cpp $(ENGINE_SRC)/engine_priv.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/texcache.h +$(ENGINE_OBJ)/textfont.$o: $(ENGINE_SRC)/textfont.cpp +$(ENGINE_OBJ)/smalltextfont.$o: $(ENGINE_SRC)/smalltextfont.cpp +$(ENGINE_OBJ)/glbuild.$o: $(ENGINE_SRC)/glbuild.cpp $(ENGINE_INC)/glbuild.h $(ENGINE_INC)/baselayer.h +$(ENGINE_OBJ)/kplib.$o: $(ENGINE_SRC)/kplib.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/kplib.h $(ENGINE_OBJ)/lz4.$o: $(ENGINE_SRC)/lz4.c $(ENGINE_INC)/lz4.h -$(ENGINE_OBJ)/md4.$o: $(ENGINE_SRC)/md4.c $(ENGINE_INC)/md4.h -$(ENGINE_OBJ)/osd.$o: $(ENGINE_SRC)/osd.c $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/baselayer.h -$(ENGINE_OBJ)/pragmas.$o: $(ENGINE_SRC)/pragmas.c $(ENGINE_INC)/compat.h -$(ENGINE_OBJ)/scriptfile.$o: $(ENGINE_SRC)/scriptfile.c $(ENGINE_INC)/scriptfile.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/compat.h -$(ENGINE_OBJ)/sdlayer.$o: $(ENGINE_SRC)/sdlayer.c $(ENGINE_SRC)/sdlayer12.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/sdlayer.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/a.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/glbuild.h -$(ENGINE_OBJ)/winlayer.$o: $(ENGINE_SRC)/winlayer.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/winlayer.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/a.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/dxdidf.h $(ENGINE_INC)/glbuild.h $(ENGINE_INC)/rawinput.h $(ENGINE_INC)/winbits.h -$(ENGINE_OBJ)/gtkbits.$o: $(ENGINE_SRC)/gtkbits.c $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/dynamicgtk.h -$(ENGINE_OBJ)/dynamicgtk.$o: $(ENGINE_SRC)/dynamicgtk.c $(ENGINE_INC)/dynamicgtk.h -$(ENGINE_OBJ)/polymer.$o: $(ENGINE_SRC)/polymer.c $(ENGINE_INC)/polymer.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/glbuild.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/polymost.h -$(ENGINE_OBJ)/mutex.$o: $(ENGINE_SRC)/mutex.c $(ENGINE_INC)/mutex.h -$(ENGINE_OBJ)/rawinput.$o: $(ENGINE_SRC)/rawinput.c $(ENGINE_INC)/rawinput.h -$(ENGINE_OBJ)/wiibits.$o: $(ENGINE_SRC)/wiibits.c $(ENGINE_INC)/wiibits.h -$(ENGINE_OBJ)/winbits.$o: $(ENGINE_SRC)/winbits.c $(ENGINE_INC)/winbits.h +$(ENGINE_OBJ)/md4.$o: $(ENGINE_SRC)/md4.cpp $(ENGINE_INC)/md4.h +$(ENGINE_OBJ)/osd.$o: $(ENGINE_SRC)/osd.cpp $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/baselayer.h +$(ENGINE_OBJ)/pragmas.$o: $(ENGINE_SRC)/pragmas.cpp $(ENGINE_INC)/compat.h +$(ENGINE_OBJ)/scriptfile.$o: $(ENGINE_SRC)/scriptfile.cpp $(ENGINE_INC)/scriptfile.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/compat.h +$(ENGINE_OBJ)/sdlayer.$o: $(ENGINE_SRC)/sdlayer.cpp $(ENGINE_SRC)/sdlayer12.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/sdlayer.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/a.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/glbuild.h +$(ENGINE_OBJ)/winlayer.$o: $(ENGINE_SRC)/winlayer.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/winlayer.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/a.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/dxdidf.h $(ENGINE_INC)/glbuild.h $(ENGINE_INC)/rawinput.h $(ENGINE_INC)/winbits.h +$(ENGINE_OBJ)/gtkbits.$o: $(ENGINE_SRC)/gtkbits.cpp $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/dynamicgtk.h +$(ENGINE_OBJ)/dynamicgtk.$o: $(ENGINE_SRC)/dynamicgtk.cpp $(ENGINE_INC)/dynamicgtk.h +$(ENGINE_OBJ)/polymer.$o: $(ENGINE_SRC)/polymer.cpp $(ENGINE_INC)/polymer.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/glbuild.h $(ENGINE_INC)/osd.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/polymost.h +$(ENGINE_OBJ)/mutex.$o: $(ENGINE_SRC)/mutex.cpp $(ENGINE_INC)/mutex.h +$(ENGINE_OBJ)/rawinput.$o: $(ENGINE_SRC)/rawinput.cpp $(ENGINE_INC)/rawinput.h +$(ENGINE_OBJ)/wiibits.$o: $(ENGINE_SRC)/wiibits.cpp $(ENGINE_INC)/wiibits.h +$(ENGINE_OBJ)/winbits.$o: $(ENGINE_SRC)/winbits.cpp $(ENGINE_INC)/winbits.h $(ENGINE_OBJ)/xxhash.$o: $(ENGINE_SRC)/xxhash.c $(ENGINE_INC)/xxhash.h -$(ENGINE_OBJ)/lunatic.$o: $(ENGINE_SRC)/lunatic.c $(ENGINE_INC)/lunatic.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/osd.h +$(ENGINE_OBJ)/lunatic.$o: $(ENGINE_SRC)/lunatic.cpp $(ENGINE_INC)/lunatic.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/osd.h -$(ENGINE_OBJ)/buildres.$(res): $(ENGINE_SRC)/misc/buildres.rc $(ENGINE_INC)/startwin.editor.h -$(ENGINE_OBJ)/startwin.editor.$o: $(ENGINE_SRC)/startwin.editor.c $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/editor.h $(ENGINE_INC)/winlayer.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/startwin.editor.h -$(ENGINE_OBJ)/startgtk.editor.$o: $(ENGINE_SRC)/startgtk.editor.c $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/editor.h $(ENGINE_INC)/compat.h +$(ENGINE_OBJ)/startwin.editor.$o: $(ENGINE_SRC)/startwin.editor.cpp $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/editor.h $(ENGINE_INC)/winlayer.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/startwin.editor.h +$(ENGINE_OBJ)/startgtk.editor.$o: $(ENGINE_SRC)/startgtk.editor.cpp $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/editor.h $(ENGINE_INC)/compat.h -$(ENGINE_OBJ)/compat_tools.$o: $(ENGINE_SRC)/util/compat_tools.c -$(ENGINE_OBJ)/kextract.$o: $(ENGINE_SRC)/util/kextract.c $(ENGINE_INC)/compat.h -$(ENGINE_OBJ)/kgroup.$o: $(ENGINE_SRC)/util/kgroup.c $(ENGINE_INC)/compat.h -$(ENGINE_OBJ)/transpal.$o: $(ENGINE_SRC)/util/transpal.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/pragmas.h -$(ENGINE_OBJ)/wad2art.$o: $(ENGINE_SRC)/util/wad2art.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/pragmas.h -$(ENGINE_OBJ)/wad2map.$o: $(ENGINE_SRC)/util/wad2map.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/pragmas.h -$(ENGINE_OBJ)/kmd2tool.$o: $(ENGINE_SRC)/util/kmd2tool.c $(ENGINE_INC)/compat.h -$(ENGINE_OBJ)/md2tool.$o: $(ENGINE_SRC)/util/md2tool.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/glbuild.h $(ENGINE_INC)/mdsprite.h -$(ENGINE_OBJ)/generateicon.$o: $(ENGINE_SRC)/util/generateicon.c $(ENGINE_INC)/kplib.h $(ENGINE_INC)/compat.h -$(ENGINE_OBJ)/cacheinfo.$o: $(ENGINE_SRC)/util/cacheinfo.c $(ENGINE_INC)/compat.h -$(ENGINE_OBJ)/enumdisplay.$o: $(ENGINE_SRC)/misc/enumdisplay.c $(ENGINE_INC)/compat.h -$(ENGINE_OBJ)/getdxdidf.$o: $(ENGINE_SRC)/misc/getdxdidf.c $(ENGINE_INC)/compat.h -$(ENGINE_OBJ)/makesdlkeytrans.$o: $(ENGINE_SRC)/misc/makesdlkeytrans.c -$(ENGINE_OBJ)/arttool.$o: $(ENGINE_SRC)/util/arttool.cc -$(ENGINE_OBJ)/givedepth.$o: $(ENGINE_SRC)/util/givedepth.c -$(ENGINE_OBJ)/mkpalette.$o: $(ENGINE_SRC)/util/mkpalette.c -$(ENGINE_OBJ)/unpackssi.$o: $(ENGINE_SRC)/util/unpackssi.c -$(ENGINE_OBJ)/bsuite.$o: $(ENGINE_SRC)/util/bsuite.c +$(TOOLS_OBJ)/compat_tools.$o: $(TOOLS_SRC)/compat_tools.cpp +$(TOOLS_OBJ)/kextract.$o: $(TOOLS_SRC)/kextract.cpp $(ENGINE_INC)/compat.h +$(TOOLS_OBJ)/kgroup.$o: $(TOOLS_SRC)/kgroup.cpp $(ENGINE_INC)/compat.h +$(TOOLS_OBJ)/transpal.$o: $(TOOLS_SRC)/transpal.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/pragmas.h +$(TOOLS_OBJ)/wad2art.$o: $(TOOLS_SRC)/wad2art.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/pragmas.h +$(TOOLS_OBJ)/wad2map.$o: $(TOOLS_SRC)/wad2map.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/pragmas.h +$(TOOLS_OBJ)/kmd2tool.$o: $(TOOLS_SRC)/kmd2tool.cpp $(ENGINE_INC)/compat.h +$(TOOLS_OBJ)/md2tool.$o: $(TOOLS_SRC)/md2tool.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_INC)/glbuild.h $(ENGINE_INC)/mdsprite.h +$(TOOLS_OBJ)/generateicon.$o: $(TOOLS_SRC)/generateicon.cpp $(ENGINE_INC)/kplib.h $(ENGINE_INC)/compat.h +$(TOOLS_OBJ)/cacheinfo.$o: $(TOOLS_SRC)/cacheinfo.cpp $(ENGINE_INC)/compat.h +$(TOOLS_OBJ)/enumdisplay.$o: $(TOOLS_SRC)/enumdisplay.cpp $(ENGINE_INC)/compat.h +$(TOOLS_OBJ)/getdxdidf.$o: $(TOOLS_SRC)/getdxdidf.cpp $(ENGINE_INC)/compat.h +$(TOOLS_OBJ)/makesdlkeytrans.$o: $(TOOLS_SRC)/makesdlkeytrans.cpp +$(TOOLS_OBJ)/arttool.$o: $(TOOLS_SRC)/arttool.cpp +$(TOOLS_OBJ)/givedepth.$o: $(TOOLS_SRC)/givedepth.cpp +$(TOOLS_OBJ)/mkpalette.$o: $(TOOLS_SRC)/mkpalette.cpp +$(TOOLS_OBJ)/unpackssi.$o: $(TOOLS_SRC)/unpackssi.cpp +$(TOOLS_OBJ)/bsuite.$o: $(TOOLS_SRC)/bsuite.cpp +$(TOOLS_OBJ)/ivfrate.$o: $(TOOLS_SRC)/ivfrate.cpp $(ENGINE_INC)/animvpx.h +$(TOOLS_OBJ)/map2stl.$o: $(TOOLS_SRC)/map2stl.cpp diff --git a/source/build/include/common.h b/source/build/include/common.h index 6b18c6e05..83e296715 100644 --- a/source/build/include/common.h +++ b/source/build/include/common.h @@ -100,8 +100,8 @@ char *dup_filename(const char *fn); int32_t maybe_append_ext(char *wbuf, int32_t wbufsiz, const char *fn, const char *ext); // Approximations to 2D and 3D Euclidean distances. Initial EDuke32 SVN import says -// in jmact/mathutil.c: "Ken's reverse-engineering job". -// Note that jmact/mathutil.c contains practically the same code, but where the +// in mact/src/mathutil.c: "Ken's reverse-engineering job". +// Note that mathutil.c contains practically the same code, but where the // individual x/y(/z) distances are passed instead. static inline int32_t sepldist(const int32_t dx, const int32_t dy) { diff --git a/source/build/include/jwzglesI.h b/source/build/include/jwzglesI.h index 0922d8eb3..bf1642d3b 100644 --- a/source/build/include/jwzglesI.h +++ b/source/build/include/jwzglesI.h @@ -17,6 +17,10 @@ #ifndef __JWZGLES_I_H__ #define __JWZGLES_I_H__ +#ifdef __cplusplus +extern "C" { +#endif + #ifdef GL_VERSION_ES_CM_1_0 /* compiling against OpenGLES 1.x */ /* These OpenGL 1.3 constants are not present in OpenGLES 1. @@ -363,5 +367,9 @@ extern const GLubyte * jwzgles_glGetString(GLenum name); extern void jwzgles_glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); extern void jwzgles_glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); extern void jwzgles_glDrawElements( GLenum mode, GLsizei count, GLenum type, const GLvoid *indices ); + +#ifdef __cplusplus +} +#endif #endif /* __JWZGLES_I_H__ */ diff --git a/source/build/include/sdlappicon.h b/source/build/include/sdlappicon.h index a39ee37d6..1922c962a 100644 --- a/source/build/include/sdlappicon.h +++ b/source/build/include/sdlappicon.h @@ -1,5 +1,5 @@ struct sdlappicon { - int32_t width,height; - uint8_t *pixels; + Sint32 width,height; + Uint8 *pixels; }; diff --git a/source/build/src/animvpx.cpp b/source/build/src/animvpx.cpp index fca0e1536..18152a76b 100644 --- a/source/build/src/animvpx.cpp +++ b/source/build/src/animvpx.cpp @@ -16,9 +16,7 @@ #include "baselayer.h" #include "build.h" #include "glbuild.h" - -#include "duke3d.h" -#include "game.h" // kopen4loadfrommod +#include "cache1d.h" #undef UNUSED #define VPX_CODEC_DISABLE_COMPAT 1 @@ -62,8 +60,7 @@ int32_t animvpx_read_ivf_header(int32_t inhandle, animvpx_ivf_header_t *hdr) if (hdr->fpsnumer < 1000) { // NOTE: We got rid of the 1/(2*fps) correction from libvpx's vpxdec.c, - // users are encouraged to use the "ivfrate" utility from the source/ - // directory instead. + // users are encouraged to use the "ivfrate" utility instead if (hdr->fpsdenom==0 || hdr->fpsnumer==0) return 5; // "invalid framerate numerator or denominator" diff --git a/source/build/src/sdlayer.cpp b/source/build/src/sdlayer.cpp index 604415c5c..c8159a200 100644 --- a/source/build/src/sdlayer.cpp +++ b/source/build/src/sdlayer.cpp @@ -114,7 +114,7 @@ static float lastvidgcb[3]; //#define KEY_PRINT_DEBUG -#include "sdlkeytrans.c" +#include "sdlkeytrans.cpp" static SDL_Surface *appicon = NULL; #if !defined __APPLE__ && !defined EDUKE32_TOUCH_DEVICES @@ -816,7 +816,7 @@ int32_t initinput(void) SDL_JoystickEventState(SDL_ENABLE); inputdevices |= 4; - // KEEPINSYNC source/gamedefs.h, source/jmact/_control.h + // KEEPINSYNC duke3d/src/gamedefs.h, mact/include/_control.h joynumaxes = min(9, SDL_JoystickNumAxes(joydev)); joynumbuttons = min(32, SDL_JoystickNumButtons(joydev)); joynumhats = min((36-joynumbuttons)/4,SDL_JoystickNumHats(joydev)); @@ -2399,5 +2399,5 @@ int32_t handleevents(void) } #if SDL_MAJOR_VERSION == 1 -#include "sdlayer12.c" +#include "sdlayer12.cpp" #endif diff --git a/source/build/src/winbits.cpp b/source/build/src/winbits.cpp index 0c0f13f35..bcb679823 100644 --- a/source/build/src/winbits.cpp +++ b/source/build/src/winbits.cpp @@ -418,5 +418,5 @@ int32_t win_buildargs(char **argvbuf) // Workaround for a bug in mingwrt-4.0.0 and up where a function named main() in misc/src/libcrt/gdtoa/qnan.c takes precedence over the proper one in src/libcrt/crt/main.c. #if (defined __MINGW32__ && EDUKE32_GCC_PREREQ(4,8)) || EDUKE32_CLANG_PREREQ(3,4) # undef main -# include "mingw_main.c" +# include "mingw_main.cpp" #endif diff --git a/source/duke3d/Dependencies.mak b/source/duke3d/Dependencies.mak index d13da9bd5..ba9350a16 100644 --- a/source/duke3d/Dependencies.mak +++ b/source/duke3d/Dependencies.mak @@ -7,74 +7,73 @@ duke3d_h=\ $(ENGINE_INC)/polymost.h \ $(ENGINE_INC)/texcache.h \ $(ENGINE_INC)/cache1d.h \ - $(MACT_ROOT)/file_lib.h \ - $(MACT_ROOT)/keyboard.h \ - $(MACT_ROOT)/mouse.h \ - $(MACT_ROOT)/joystick.h \ - $(MACT_ROOT)/control.h \ + $(MACT_INC)/file_lib.h \ + $(MACT_INC)/keyboard.h \ + $(MACT_INC)/mouse.h \ + $(MACT_INC)/joystick.h \ + $(MACT_INC)/control.h \ $(DUKE3D_SRC)/macros.h \ - $(DUKE3D_INC)/gamedefs.h \ - $(DUKE3D_INC)/function.h \ - $(DUKE3D_INC)/config.h \ - $(DUKE3D_INC)/sounds.h \ - $(DUKE3D_INC)/sounds_common.h \ - $(DUKE3D_INC)/soundsdyn.h \ - $(DUKE3D_INC)/rts.h \ - $(DUKE3D_INC)/_rts.h \ - $(DUKE3D_INC)/soundefs.h \ + $(DUKE3D_SRC)/gamedefs.h \ + $(DUKE3D_SRC)/function.h \ + $(DUKE3D_SRC)/config.h \ + $(DUKE3D_SRC)/sounds.h \ + $(DUKE3D_SRC)/sounds_common.h \ + $(DUKE3D_SRC)/soundsdyn.h \ + $(DUKE3D_SRC)/rts.h \ + $(DUKE3D_SRC)/_rts.h \ + $(DUKE3D_SRC)/soundefs.h \ $(AUDIOLIB_INC)/fx_man.h \ $(AUDIOLIB_INC)/music.h \ - $(DUKE3D_INC)/namesdyn.h \ - $(DUKE3D_INC)/duke3d.h \ - $(DUKE3D_INC)/player.h \ - $(DUKE3D_INC)/sector.h \ - $(DUKE3D_INC)/game.h \ - $(DUKE3D_INC)/actors.h \ - $(DUKE3D_INC)/menus.h + $(DUKE3D_SRC)/namesdyn.h \ + $(DUKE3D_SRC)/duke3d.h \ + $(DUKE3D_SRC)/player.h \ + $(DUKE3D_SRC)/sector.h \ + $(DUKE3D_SRC)/game.h \ + $(DUKE3D_SRC)/actors.h \ + $(DUKE3D_SRC)/menus.h gamedef_h=$(DUKE3D_SRC)/gamedef.h $(DUKE3D_SRC)/gameexec.h $(DUKE3D_SRC)/gamevars.h -game_defs_dep=$(DUKE3D_SRC)/lunatic/defs.ilua +game_defs_dep=$(DUKE3D_SRC)/lunatic/_defs_game.lua -$(DUKE3D_OBJ)/game.$o: $(DUKE3D_SRC)/game.c $(game_defs_dep) $(MACT_ROOT)/scriplib.h $(duke3d_h) $(DUKE3D_SRC)/input.h $(DUKE3D_INC)/osdfuncs.h $(DUKE3D_INC)/osdcmds.h $(DUKE3D_INC)/grpscan.h $(DUKE3D_INC)/demo.h $(ENGINE_INC)/hightile.h -$(DUKE3D_OBJ)/actors.$o: $(DUKE3D_SRC)/actors.c $(duke3d_h) -$(DUKE3D_OBJ)/anim.$o: $(DUKE3D_SRC)/anim.c $(duke3d_h) $(DUKE3D_SRC)/input.h $(MACT_ROOT)/animlib.h $(DUKE3D_SRC)/animvpx.h $(DUKE3D_SRC)/animsounds.h -$(DUKE3D_OBJ)/animsounds.$o: $(DUKE3D_SRC)/animsounds.c $(DUKE3D_SRC)/animsounds.h -$(DUKE3D_OBJ)/cheats.$o: $(DUKE3D_SRC)/cheats.c $(DUKE3D_SRC)/cheats.h -$(DUKE3D_OBJ)/cmdline.$o: $(DUKE3D_SRC)/cmdline.c $(DUKE3D_SRC)/cmdline.h -$(DUKE3D_OBJ)/demo.$o: $(DUKE3D_SRC)/demo.c $(duke3d_h) $(DUKE3D_SRC)/input.h -$(DUKE3D_OBJ)/gamedef.$o: $(DUKE3D_SRC)/gamedef.c $(duke3d_h) $(gamedef_h) $(DUKE3D_SRC)/savegame.h -$(DUKE3D_OBJ)/gameexec.$o: $(DUKE3D_SRC)/gameexec.c $(DUKE3D_SRC)/gamestructures.c $(duke3d_h) $(gamedef_h) -$(DUKE3D_OBJ)/gamestructures.$o: $(DUKE3D_SRC)/gamestructures.c $(duke3d_h) $(gamedef_h) -$(DUKE3D_OBJ)/gamevars.$o: $(DUKE3D_SRC)/gamevars.c $(DUKE3D_SRC)/gamestructures.c $(duke3d_h) $(gamedef_h) $(DUKE3D_SRC)/savegame.h -$(DUKE3D_OBJ)/global.$o: $(DUKE3D_SRC)/*.c $(DUKE3D_SRC)/global.c $(duke3d_h) -$(DUKE3D_OBJ)/input.$o: $(DUKE3D_SRC)/input.c $(duke3d_h) $(DUKE3D_SRC)/input.h +$(DUKE3D_OBJ)/game.$o: $(DUKE3D_SRC)/game.cpp $(game_defs_dep) $(MACT_INC)/scriplib.h $(duke3d_h) $(DUKE3D_SRC)/input.h $(DUKE3D_SRC)/osdfuncs.h $(DUKE3D_SRC)/osdcmds.h $(DUKE3D_SRC)/grpscan.h $(DUKE3D_SRC)/demo.h $(ENGINE_INC)/hightile.h +$(DUKE3D_OBJ)/actors.$o: $(DUKE3D_SRC)/actors.cpp $(duke3d_h) +$(DUKE3D_OBJ)/anim.$o: $(DUKE3D_SRC)/anim.cpp $(duke3d_h) $(DUKE3D_SRC)/input.h $(MACT_INC)/animlib.h $(ENGINE_INC)/animvpx.h $(DUKE3D_SRC)/animsounds.h +$(DUKE3D_OBJ)/animsounds.$o: $(DUKE3D_SRC)/animsounds.cpp $(DUKE3D_SRC)/animsounds.h +$(DUKE3D_OBJ)/cheats.$o: $(DUKE3D_SRC)/cheats.cpp $(DUKE3D_SRC)/cheats.h +$(DUKE3D_OBJ)/cmdline.$o: $(DUKE3D_SRC)/cmdline.cpp $(DUKE3D_SRC)/cmdline.h +$(DUKE3D_OBJ)/demo.$o: $(DUKE3D_SRC)/demo.cpp $(duke3d_h) $(DUKE3D_SRC)/input.h +$(DUKE3D_OBJ)/gamedef.$o: $(DUKE3D_SRC)/gamedef.cpp $(duke3d_h) $(gamedef_h) $(DUKE3D_SRC)/savegame.h +$(DUKE3D_OBJ)/gameexec.$o: $(DUKE3D_SRC)/gameexec.cpp $(DUKE3D_SRC)/gamestructures.cpp $(duke3d_h) $(gamedef_h) +$(DUKE3D_OBJ)/gamestructures.$o: $(DUKE3D_SRC)/gamestructures.cpp $(duke3d_h) $(gamedef_h) +$(DUKE3D_OBJ)/gamevars.$o: $(DUKE3D_SRC)/gamevars.cpp $(DUKE3D_SRC)/gamestructures.cpp $(duke3d_h) $(gamedef_h) $(DUKE3D_SRC)/savegame.h +$(DUKE3D_OBJ)/global.$o: $(DUKE3D_SRC)/*.cpp $(DUKE3D_SRC)/global.cpp $(duke3d_h) +$(DUKE3D_OBJ)/input.$o: $(DUKE3D_SRC)/input.cpp $(duke3d_h) $(DUKE3D_SRC)/input.h $(DUKE3D_OBJ)/mdump.$o: $(DUKE3D_SRC)/mdump.cpp $(DUKE3D_SRC)/mdump.h -$(DUKE3D_OBJ)/menus.$o: $(DUKE3D_SRC)/menus.c $(duke3d_h) $(DUKE3D_SRC)/input.h $(MACT_ROOT)/mouse.h $(DUKE3D_SRC)/menus.h -$(DUKE3D_OBJ)/namesdyn.$o: $(DUKE3D_SRC)/namesdyn.c $(duke3d_h) -$(DUKE3D_OBJ)/net.$o: $(DUKE3D_SRC)/net.c $(duke3d_h) -$(DUKE3D_OBJ)/player.$o: $(DUKE3D_SRC)/player.c $(duke3d_h) -$(DUKE3D_OBJ)/premap.$o: $(DUKE3D_SRC)/premap.c $(duke3d_h) $(ENGINE_INC)/osd.h -$(DUKE3D_OBJ)/savegame.$o: $(DUKE3D_SRC)/savegame.c $(duke3d_h) $(DUKE3D_SRC)/savegame.h -$(DUKE3D_OBJ)/sbar.$o: $(DUKE3D_SRC)/sbar.c $(DUKE3D_SRC)/sbar.h -$(DUKE3D_OBJ)/screens.$o: $(DUKE3D_SRC)/screens.c $(DUKE3D_SRC)/screens.h -$(DUKE3D_OBJ)/screentext.$o: $(DUKE3D_SRC)/screentext.c $(DUKE3D_SRC)/screentext.h -$(DUKE3D_OBJ)/sector.$o: $(DUKE3D_SRC)/sector.c $(duke3d_h) $(DUKE3D_SRC)/input.h -$(DUKE3D_OBJ)/sounds.$o: $(DUKE3D_SRC)/sounds.c $(duke3d_h) -$(DUKE3D_OBJ)/soundsdyn.$o: $(DUKE3D_SRC)/soundsdyn.c $(duke3d_h) -$(DUKE3D_OBJ)/rts.$o: $(DUKE3D_SRC)/rts.c $(duke3d_h) -$(DUKE3D_OBJ)/config.$o: $(DUKE3D_SRC)/config.c $(duke3d_h) $(MACT_ROOT)/scriplib.h $(DUKE3D_INC)/_functio.h -$(DUKE3D_OBJ)/winbits.$o: $(DUKE3D_SRC)/winbits.c +$(DUKE3D_OBJ)/menus.$o: $(DUKE3D_SRC)/menus.cpp $(duke3d_h) $(DUKE3D_SRC)/input.h $(MACT_INC)/mouse.h $(DUKE3D_SRC)/menus.h +$(DUKE3D_OBJ)/namesdyn.$o: $(DUKE3D_SRC)/namesdyn.cpp $(duke3d_h) +$(DUKE3D_OBJ)/net.$o: $(DUKE3D_SRC)/net.cpp $(duke3d_h) +$(DUKE3D_OBJ)/player.$o: $(DUKE3D_SRC)/player.cpp $(duke3d_h) +$(DUKE3D_OBJ)/premap.$o: $(DUKE3D_SRC)/premap.cpp $(duke3d_h) $(ENGINE_INC)/osd.h +$(DUKE3D_OBJ)/savegame.$o: $(DUKE3D_SRC)/savegame.cpp $(duke3d_h) $(DUKE3D_SRC)/savegame.h +$(DUKE3D_OBJ)/sbar.$o: $(DUKE3D_SRC)/sbar.cpp $(DUKE3D_SRC)/sbar.h +$(DUKE3D_OBJ)/screens.$o: $(DUKE3D_SRC)/screens.cpp $(DUKE3D_SRC)/screens.h +$(DUKE3D_OBJ)/screentext.$o: $(DUKE3D_SRC)/screentext.cpp $(DUKE3D_SRC)/screentext.h +$(DUKE3D_OBJ)/sector.$o: $(DUKE3D_SRC)/sector.cpp $(duke3d_h) $(DUKE3D_SRC)/input.h +$(DUKE3D_OBJ)/sounds.$o: $(DUKE3D_SRC)/sounds.cpp $(duke3d_h) +$(DUKE3D_OBJ)/soundsdyn.$o: $(DUKE3D_SRC)/soundsdyn.cpp $(duke3d_h) +$(DUKE3D_OBJ)/rts.$o: $(DUKE3D_SRC)/rts.cpp $(duke3d_h) +$(DUKE3D_OBJ)/config.$o: $(DUKE3D_SRC)/config.cpp $(duke3d_h) $(MACT_INC)/scriplib.h $(DUKE3D_SRC)/_functio.h +$(DUKE3D_OBJ)/winbits.$o: $(DUKE3D_SRC)/winbits.cpp $(DUKE3D_OBJ)/osdfuncs.$o: $(DUKE3D_SRC)/names.h $(ENGINE_INC)/build.h $(ENGINE_INC)/osd.h -$(DUKE3D_OBJ)/osdcmds.$o: $(DUKE3D_SRC)/osdcmds.c $(DUKE3D_INC)/osdcmds.h $(ENGINE_INC)/osd.h $(duke3d_h) -$(DUKE3D_OBJ)/animvpx.$o: $(DUKE3D_SRC)/animvpx.c $(DUKE3D_SRC)/animvpx.h $(duke3d_h) $(ENGINE_INC)/glbuild.h +$(DUKE3D_OBJ)/osdcmds.$o: $(DUKE3D_SRC)/osdcmds.cpp $(DUKE3D_SRC)/osdcmds.h $(ENGINE_INC)/osd.h $(duke3d_h) -$(DUKE3D_OBJ)/lunatic_game.$o: $(ENGINE_INC)/lunatic.h $(DUKE3D_SRC)/lunatic/lunatic_game.c $(DUKE3D_SRC)/lunatic/lunatic_game.h $(DUKE3D_SRC)/gamedef.h $(DUKE3D_SRC)/gameexec.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/osd.h -$(DUKE3D_OBJ)/lunatic_m32.$o: $(ENGINE_INC)/lunatic.h $(DUKE3D_SRC)/lunatic/lunatic_m32.c $(DUKE3D_SRC)/lunatic/lunatic_m32.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/osd.h +$(DUKE3D_OBJ)/lunatic_game.$o: $(ENGINE_INC)/lunatic.h $(DUKE3D_SRC)/lunatic/lunatic_game.cpp $(DUKE3D_SRC)/lunatic/lunatic_game.h $(DUKE3D_SRC)/gamedef.h $(DUKE3D_SRC)/gameexec.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/osd.h +$(DUKE3D_OBJ)/lunatic_editor.$o: $(ENGINE_INC)/lunatic.h $(DUKE3D_SRC)/lunatic/lunatic_editor.cpp $(DUKE3D_SRC)/lunatic/lunatic_editor.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/osd.h # editor objects m32_script_hs=$(ENGINE_INC)/m32script.h $(DUKE3D_SRC)/m32def.h -$(DUKE3D_OBJ)/astub.$o: $(DUKE3D_SRC)/astub.c \ +$(DUKE3D_OBJ)/astub.$o: $(DUKE3D_SRC)/astub.cpp \ $(ENGINE_INC)/compat.h \ $(ENGINE_INC)/build.h \ $(ENGINE_INC)/editor.h \ @@ -91,7 +90,7 @@ $(DUKE3D_OBJ)/astub.$o: $(DUKE3D_SRC)/astub.c \ $(DUKE3D_SRC)/mapster32.h \ $(DUKE3D_SRC)/keys.h \ $(m32_script_hs) -$(DUKE3D_OBJ)/sounds_mapster32.$o: $(DUKE3D_SRC)/sounds_mapster32.c \ +$(DUKE3D_OBJ)/sounds_mapster32.$o: $(DUKE3D_SRC)/sounds_mapster32.cpp \ $(DUKE3D_SRC)/sounds_mapster32.h \ $(DUKE3D_SRC)/sounds_common.h \ $(ENGINE_INC)/compat.h \ @@ -103,33 +102,31 @@ $(DUKE3D_OBJ)/sounds_mapster32.$o: $(DUKE3D_SRC)/sounds_mapster32.c \ $(DUKE3D_SRC)/macros.h \ $(AUDIOLIB_INC)/fx_man.h \ -$(DUKE3D_OBJ)/m32def.$o: $(DUKE3D_SRC)/m32def.c $(m32_script_hs) $(ENGINE_INC)/cache1d.h $(DUKE3D_SRC)/sounds_mapster32.h $(DUKE3D_SRC)/sounds_common.h $(DUKE3D_SRC)/keys.h -$(DUKE3D_OBJ)/m32exec.$o: $(DUKE3D_SRC)/m32exec.c $(m32_script_hs) $(DUKE3D_SRC)/sounds_mapster32.h $(DUKE3D_SRC)/sounds_common.h $(ENGINE_INC)/osd.h $(DUKE3D_SRC)/keys.h $(AUDIOLIB_INC)/fx_man.h -$(DUKE3D_OBJ)/m32structures.$o: $(DUKE3D_SRC)/m32structures.c $(m32_script_hs) $(ENGINE_INC)/compat.h $(ENGINE_INC)/prlights.h -$(DUKE3D_OBJ)/m32vars.$o: $(DUKE3D_SRC)/m32vars.c $(DUKE3D_SRC)/m32structures.c $(m32_script_hs) $(ENGINE_INC)/osd.h $(DUKE3D_SRC)/keys.h $(ENGINE_INC)/polymer.h -# TODO: m32common.c +$(DUKE3D_OBJ)/m32def.$o: $(DUKE3D_SRC)/m32def.cpp $(m32_script_hs) $(ENGINE_INC)/cache1d.h $(DUKE3D_SRC)/sounds_mapster32.h $(DUKE3D_SRC)/sounds_common.h $(DUKE3D_SRC)/keys.h +$(DUKE3D_OBJ)/m32exec.$o: $(DUKE3D_SRC)/m32exec.cpp $(m32_script_hs) $(DUKE3D_SRC)/sounds_mapster32.h $(DUKE3D_SRC)/sounds_common.h $(ENGINE_INC)/osd.h $(DUKE3D_SRC)/keys.h $(AUDIOLIB_INC)/fx_man.h +$(DUKE3D_OBJ)/m32structures.$o: $(DUKE3D_SRC)/m32structures.cpp $(m32_script_hs) $(ENGINE_INC)/compat.h $(ENGINE_INC)/prlights.h +$(DUKE3D_OBJ)/m32vars.$o: $(DUKE3D_SRC)/m32vars.cpp $(DUKE3D_SRC)/m32structures.cpp $(m32_script_hs) $(ENGINE_INC)/osd.h $(DUKE3D_SRC)/keys.h $(ENGINE_INC)/polymer.h +# TODO: m32common.cpp # misc objects $(DUKE3D_OBJ)/game_icon.$o: $(DUKE3D_RSRC)/game_icon.c $(DUKE3D_RSRC)/game_icon.ico $(DUKE3D_OBJ)/build_icon.$o: $(DUKE3D_RSRC)/build_icon.c $(DUKE3D_RSRC)/build_icon.ico -$(DUKE3D_OBJ)/grpscan.$o: $(DUKE3D_SRC)/grpscan.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/scriptfile.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/crc32.h $(DUKE3D_INC)/grpscan.h -$(DUKE3D_OBJ)/gameres.$o: $(DUKE3D_SRC)/misc/gameres.rc $(DUKE3D_SRC)/startwin.game.h $(DUKE3D_RSRC)/game.bmp -$(DUKE3D_OBJ)/buildres.$o: $(DUKE3D_SRC)/misc/buildres.rc $(ENGINE_INC)/startwin.editor.h $(DUKE3D_RSRC)/build.bmp -$(DUKE3D_OBJ)/startwin.game.$o: $(DUKE3D_SRC)/startwin.game.c $(duke3d_h) $(ENGINE_INC)/build.h $(ENGINE_INC)/winlayer.h $(ENGINE_INC)/compat.h $(DUKE3D_INC)/grpscan.h -$(DUKE3D_OBJ)/startgtk.game.$o: $(DUKE3D_SRC)/startgtk.game.c $(duke3d_h) $(ENGINE_INC)/dynamicgtk.h $(ENGINE_INC)/build.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/compat.h +$(DUKE3D_OBJ)/grpscan.$o: $(DUKE3D_SRC)/grpscan.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/scriptfile.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/crc32.h $(DUKE3D_SRC)/grpscan.h +$(DUKE3D_OBJ)/gameres.$o: $(DUKE3D_RSRC)/gameres.rc $(DUKE3D_SRC)/startwin.game.h $(DUKE3D_RSRC)/game.bmp +$(DUKE3D_OBJ)/buildres.$o: $(DUKE3D_RSRC)/buildres.rc $(ENGINE_INC)/startwin.editor.h $(DUKE3D_RSRC)/build.bmp +$(DUKE3D_OBJ)/startwin.game.$o: $(DUKE3D_SRC)/startwin.game.cpp $(duke3d_h) $(ENGINE_INC)/build.h $(ENGINE_INC)/winlayer.h $(ENGINE_INC)/compat.h $(DUKE3D_SRC)/grpscan.h +$(DUKE3D_OBJ)/startgtk.game.$o: $(DUKE3D_SRC)/startgtk.game.cpp $(duke3d_h) $(ENGINE_INC)/dynamicgtk.h $(ENGINE_INC)/build.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/compat.h # MACT objects -$(DUKE3D_OBJ)/animlib.$o: $(MACT_ROOT)/animlib.c $(MACT_ROOT)/animlib.h $(ENGINE_INC)/compat.h -$(DUKE3D_OBJ)/file_lib.$o: $(MACT_ROOT)/file_lib.c $(MACT_ROOT)/file_lib.h -$(DUKE3D_OBJ)/control.$o: $(MACT_ROOT)/control.c $(MACT_ROOT)/control.h $(MACT_ROOT)/keyboard.h $(MACT_ROOT)/mouse.h $(MACT_ROOT)/joystick.h $(ENGINE_INC)/baselayer.h -$(DUKE3D_OBJ)/keyboard.$o: $(MACT_ROOT)/keyboard.c $(MACT_ROOT)/keyboard.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/baselayer.h -$(DUKE3D_OBJ)/joystick.$o: $(MACT_ROOT)/joystick.c $(MACT_ROOT)/joystick.h $(ENGINE_INC)/baselayer.h -$(DUKE3D_OBJ)/scriplib.$o: $(MACT_ROOT)/scriplib.c $(MACT_ROOT)/scriplib.h $(MACT_ROOT)/_scrplib.h $(ENGINE_INC)/compat.h +$(MACT_OBJ)/animlib.$o: $(MACT_SRC)/animlib.cpp $(MACT_INC)/animlib.h $(ENGINE_INC)/compat.h +$(MACT_OBJ)/file_lib.$o: $(MACT_SRC)/file_lib.cpp $(MACT_INC)/file_lib.h +$(MACT_OBJ)/control.$o: $(MACT_SRC)/control.cpp $(MACT_INC)/control.h $(MACT_INC)/keyboard.h $(MACT_INC)/mouse.h $(MACT_INC)/joystick.h $(ENGINE_INC)/baselayer.h +$(MACT_OBJ)/keyboard.$o: $(MACT_SRC)/keyboard.cpp $(MACT_INC)/keyboard.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/baselayer.h +$(MACT_OBJ)/joystick.$o: $(MACT_SRC)/joystick.cpp $(MACT_INC)/joystick.h $(ENGINE_INC)/baselayer.h +$(MACT_OBJ)/scriplib.$o: $(MACT_SRC)/scriplib.cpp $(MACT_INC)/scriplib.h $(MACT_SRC)/_scrplib.h $(ENGINE_INC)/compat.h -$(DUKE3D_OBJ)/midi.$o: $(DUKE3D_SRC)/midi.c $(DUKE3D_SRC)/_midi.h $(DUKE3D_SRC)/midi.h $(AUDIOLIB_INC)/music.h -$(DUKE3D_OBJ)/mpu401.$o: $(DUKE3D_SRC)/mpu401.c $(DUKE3D_SRC)/mpu401.h $(AUDIOLIB_INC)/music.h -$(DUKE3D_OBJ)/music.$o: $(DUKE3D_SRC)/music.c $(DUKE3D_SRC)/midi.h $(DUKE3D_SRC)/mpu401.h $(AUDIOLIB_INC)/music.h - -$(DUKE3D_OBJ)/ivfrate.$o: $(DUKE3D_SRC)/util/ivfrate.c $(DUKE3D_SRC)/animvpx.h +$(DUKE3D_OBJ)/midi.$o: $(DUKE3D_SRC)/midi.cpp $(DUKE3D_SRC)/_midi.h $(DUKE3D_SRC)/midi.h $(AUDIOLIB_INC)/music.h +$(DUKE3D_OBJ)/mpu401.$o: $(DUKE3D_SRC)/mpu401.cpp $(DUKE3D_SRC)/mpu401.h $(AUDIOLIB_INC)/music.h +$(DUKE3D_OBJ)/music.$o: $(DUKE3D_SRC)/music.cpp $(DUKE3D_SRC)/midi.h $(DUKE3D_SRC)/mpu401.h $(AUDIOLIB_INC)/music.h diff --git a/source/duke3d/rsrc/eduke32_icon.c b/source/duke3d/rsrc/eduke32_icon.c index babf6bd6f..4a4da8e81 100644 --- a/source/duke3d/rsrc/eduke32_icon.c +++ b/source/duke3d/rsrc/eduke32_icon.c @@ -1,9 +1,8 @@ -#include "compat.h" -#include "sdlappicon.h" #include "sdl_inc.h" +#include "sdlappicon.h" -static uint8_t sdlappicon_pixels[] = { +static Uint8 sdlappicon_pixels[] = { #if defined _WIN32 && SDL_MAJOR_VERSION==1 # include "eduke32_icon_32px.c" #else diff --git a/source/duke3d/src/android.h b/source/duke3d/src/android.h index 586777ad9..eebf69422 100644 --- a/source/duke3d/src/android.h +++ b/source/duke3d/src/android.h @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifdef __ANDROID__ #include "compat.h" #include "control.h" -#include "android/in_android.h" +#include "in_android.h" //extern int android_sample_rate; diff --git a/source/duke3d/src/astub.cpp b/source/duke3d/src/astub.cpp index 4685c32a6..c7986b272 100644 --- a/source/duke3d/src/astub.cpp +++ b/source/duke3d/src/astub.cpp @@ -57,7 +57,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "m32def.h" #ifdef LUNATIC -# include "lunatic_m32.h" +# include "lunatic_editor.h" #endif extern const char *s_buildRev; @@ -10045,10 +10045,10 @@ int32_t ExtPostStartupWindow(void) #ifdef LUNATIC if (Em_CreateState(&g_EmState) == 0) { - extern const char luaJIT_BC_defs_m32[]; + extern const char luaJIT_BC__defs_editor[]; - int32_t i = L_RunString(&g_EmState, luaJIT_BC_defs_m32, - LUNATIC_DEFS_M32_BC_SIZE, "defs_m32.ilua"); + int32_t i = L_RunString(&g_EmState, luaJIT_BC__defs_editor, + LUNATIC_DEFS_M32_BC_SIZE, "_defs_editor.lua"); if (i != 0) { Em_DestroyState(&g_EmState); diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp index 448588bd1..f63938c46 100644 --- a/source/duke3d/src/game.cpp +++ b/source/duke3d/src/game.cpp @@ -5677,10 +5677,10 @@ void El_CreateGameState(void) } else { - extern const char luaJIT_BC_defs[]; + extern const char luaJIT_BC__defs_game[]; - if ((i = L_RunString(&g_ElState, luaJIT_BC_defs, - LUNATIC_DEFS_BC_SIZE, "defs.ilua"))) + if ((i = L_RunString(&g_ElState, luaJIT_BC__defs_game, + LUNATIC_DEFS_BC_SIZE, "_defs_game.lua"))) { initprintf("Lunatic: Error preparing global ELua state (code %d)\n", i); El_DestroyState(&g_ElState); @@ -5752,7 +5752,7 @@ static void G_Startup(void) G_PostCreateGameState(); #ifdef LUNATIC // NOTE: This is only effective for CON-defined EVENT_INIT. See EVENT_INIT - // not in defs.ilua. + // not in _defs_game.lua. VM_OnEvent(EVENT_INIT, -1, -1); #endif if (g_netServer || ud.multimode > 1) G_CheckGametype(); diff --git a/source/duke3d/src/game.h b/source/duke3d/src/game.h index 1fd5c9c6a..e07a77693 100644 --- a/source/duke3d/src/game.h +++ b/source/duke3d/src/game.h @@ -128,7 +128,7 @@ extern camera_t g_camera; # define CAMERACLOCK g_cameraClock #endif -// KEEPINSYNC lunatic/defs.ilua +// KEEPINSYNC lunatic/_defs_game.lua typedef struct { #if !defined LUNATIC vec3_t camerapos; @@ -171,7 +171,7 @@ typedef struct { int32_t SmoothInput; // JBF 20031211: Store the input settings because - // (currently) jmact can't regurgitate them + // (currently) mact can't regurgitate them int32_t MouseFunctions[MAXMOUSEBUTTONS][2]; int32_t MouseDigitalFunctions[MAXMOUSEAXES][2]; int32_t MouseAnalogueAxes[MAXMOUSEAXES]; diff --git a/source/duke3d/src/gamedefs.h b/source/duke3d/src/gamedefs.h index fd2b9b5ab..b359c8cc2 100644 --- a/source/duke3d/src/gamedefs.h +++ b/source/duke3d/src/gamedefs.h @@ -37,15 +37,15 @@ extern "C" { // config file name #define SETUPFILENAME APPBASENAME ".cfg" -// KEEPINSYNC source/jmact/_control.h, build/src/sdlayer.c +// KEEPINSYNC mact/include/_control.h, build/src/sdlayer.cpp #define MAXJOYBUTTONS 32 #define MAXJOYBUTTONSANDHATS (MAXJOYBUTTONS+4) -// KEEPINSYNC source/jmact/_control.h, build/src/sdlayer.c +// KEEPINSYNC mact/include/_control.h, build/src/sdlayer.cpp #define MAXMOUSEAXES 2 #define MAXMOUSEDIGITAL (MAXMOUSEAXES*2) -// KEEPINSYNC source/jmact/_control.h, build/src/sdlayer.c +// KEEPINSYNC mact/include/_control.h, build/src/sdlayer.cpp #define MAXJOYAXES 9 #define MAXJOYDIGITAL (MAXJOYAXES*2) diff --git a/source/duke3d/src/gameexec.cpp b/source/duke3d/src/gameexec.cpp index 0a3b00a42..299070090 100644 --- a/source/duke3d/src/gameexec.cpp +++ b/source/duke3d/src/gameexec.cpp @@ -73,7 +73,7 @@ int32_t g_structVarIDs = -1; GAMEEXEC_STATIC void VM_Execute(int loop); -# include "gamestructures.c" +# include "gamestructures.cpp" #endif #define VM_CONDITIONAL(xxx) \ diff --git a/source/duke3d/src/gamevars.cpp b/source/duke3d/src/gamevars.cpp index 9c2f6d26b..f83369add 100644 --- a/source/duke3d/src/gamevars.cpp +++ b/source/duke3d/src/gamevars.cpp @@ -56,7 +56,7 @@ intptr_t *aplWeaponReloadSound2[MAX_WEAPONS]; // Sound of magazine being inser intptr_t *aplWeaponSelectSound[MAX_WEAPONS]; // Sound of weapon being selected intptr_t *aplWeaponFlashColor[MAX_WEAPONS]; // Muzzle flash color -# include "gamestructures.c" +# include "gamestructures.cpp" // Frees the memory for the *values* of game variables and arrays. Resets their // counts to zero. Call this function as many times as needed. diff --git a/source/duke3d/src/in_android.cpp b/source/duke3d/src/in_android.cpp index e63f1f116..b6c3fd863 100644 --- a/source/duke3d/src/in_android.cpp +++ b/source/duke3d/src/in_android.cpp @@ -34,9 +34,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "anim.h" #include "player.h" -#include "jmact/keyboard.h" -#include "jmact/control.h" -#include "jmact/_control.h" +#include "keyboard.h" +#include "control.h" +#include "_control.h" #include "menus.h" diff --git a/source/duke3d/src/lunatic/_defs_game.lua b/source/duke3d/src/lunatic/_defs_game.lua index 90cb87ef2..1b483ac23 100644 --- a/source/duke3d/src/lunatic/_defs_game.lua +++ b/source/duke3d/src/lunatic/_defs_game.lua @@ -533,7 +533,7 @@ typedef struct { int32_t SmoothInput; // JBF 20031211: Store the input settings because - // (currently) jmact can't regurgitate them + // (currently) mact can't regurgitate them int32_t MouseFunctions[MAXMOUSEBUTTONS][2]; int32_t MouseDigitalFunctions[MAXMOUSEAXES][2]; int32_t MouseAnalogueAxes[MAXMOUSEAXES]; diff --git a/source/duke3d/src/lunatic/control.lua b/source/duke3d/src/lunatic/control.lua index 945541fe7..b55316ab1 100644 --- a/source/duke3d/src/lunatic/control.lua +++ b/source/duke3d/src/lunatic/control.lua @@ -2291,7 +2291,7 @@ end --- More functions of the official API --- -- Non-local control flow. These ones call the original error(), not our --- redefinition in defs.ilua. +-- redefinition in _defs_game.lua. function longjmp() error(false) end diff --git a/source/duke3d/src/lunatic/defs_common.lua b/source/duke3d/src/lunatic/defs_common.lua index f0c0fb612..c832fd2bd 100644 --- a/source/duke3d/src/lunatic/defs_common.lua +++ b/source/duke3d/src/lunatic/defs_common.lua @@ -168,7 +168,7 @@ bitint_new_struct_type("uint8_t", "UBit8") bitint_new_struct_type("uint16_t", "UBit16") -- Converts a template struct definition to an internal, unrestricted one. --- NOTE: "[^ ]*" for const decorations in defs.ilua. +-- NOTE: "[^ ]*" for const decorations in _defs_game.lua. function strip_const(structstr) return (string.gsub(structstr, "const[^ ]* ", "")); end diff --git a/source/duke3d/src/lunatic/dynsymlist_editor.lds b/source/duke3d/src/lunatic/dynsymlist_editor.lds index 4c16c1df0..aa1d35b41 100644 --- a/source/duke3d/src/lunatic/dynsymlist_editor.lds +++ b/source/duke3d/src/lunatic/dynsymlist_editor.lds @@ -92,7 +92,7 @@ OSD_Printf; Bcrc32; -luaJIT_BC_defs_m32; +luaJIT_BC__defs_editor; luaJIT_BC_defs_common; luaJIT_BC_engine_maptext; luaJIT_BC_engine; diff --git a/source/duke3d/src/lunatic/dynsymlist_game.lds b/source/duke3d/src/lunatic/dynsymlist_game.lds index 70b282feb..48b9e0319 100644 --- a/source/duke3d/src/lunatic/dynsymlist_game.lds +++ b/source/duke3d/src/lunatic/dynsymlist_game.lds @@ -198,7 +198,7 @@ luaJIT_BC_control; luaJIT_BC_bcarray; luaJIT_BC_bcheck; luaJIT_BC_xmath; -luaJIT_BC_defs; +luaJIT_BC__defs_game; luaJIT_BC_v; luaJIT_BC_dump; luaJIT_BC_dis_x86; diff --git a/source/duke3d/src/lunatic/engine.lua b/source/duke3d/src/lunatic/engine.lua index 08456627e..53adedf21 100644 --- a/source/duke3d/src/lunatic/engine.lua +++ b/source/duke3d/src/lunatic/engine.lua @@ -9,7 +9,7 @@ local error = error local ipairs = ipairs local type = type -local decl = assert(decl) -- comes from above (defs.ilua or defs_m32.lua) +local decl = assert(decl) -- comes from above (_defs_game.lua or defs_m32.lua) local ismapster32 = (C.LUNATIC_CLIENT == C.LUNATIC_CLIENT_MAPSTER32) diff --git a/source/duke3d/src/lunatic/lunatic_editor.cpp b/source/duke3d/src/lunatic/lunatic_editor.cpp index ebd15a26e..285b939da 100644 --- a/source/duke3d/src/lunatic/lunatic_editor.cpp +++ b/source/duke3d/src/lunatic/lunatic_editor.cpp @@ -6,7 +6,7 @@ # include #endif -#include "lunatic_m32.h" +#include "lunatic_editor.h" int Em_CreateState(L_State *estate) diff --git a/source/duke3d/src/lunatic/lunatic_game.cpp b/source/duke3d/src/lunatic/lunatic_game.cpp index db6e13b17..fbc4ae604 100644 --- a/source/duke3d/src/lunatic/lunatic_game.cpp +++ b/source/duke3d/src/lunatic/lunatic_game.cpp @@ -1,5 +1,7 @@ /* The Lunatic Interpreter, part of EDuke32. Game-side stuff. */ +#include "compat.h" + #include #include // getenv #include diff --git a/source/duke3d/src/lunatic/randgen.lua b/source/duke3d/src/lunatic/randgen.lua index 36fd63cda..81841df04 100644 --- a/source/duke3d/src/lunatic/randgen.lua +++ b/source/duke3d/src/lunatic/randgen.lua @@ -6,7 +6,7 @@ local ffiC = ffi.C local rawset = rawset local type = type -local decl = decl -- comes from above (defs.ilua) +local decl = decl -- comes from above (_defs_game.lua) local print = print -- for commented out debug block in new() below diff --git a/source/duke3d/src/lunatic/test/gamearray.con b/source/duke3d/src/lunatic/test/gamearray.con index 075f489a9..49a47464d 100644 --- a/source/duke3d/src/lunatic/test/gamearray.con +++ b/source/duke3d/src/lunatic/test/gamearray.con @@ -44,8 +44,7 @@ state error // This doesn't work in C-CON: // setactor[-1].cstat 0 - // source/lunatic/test/gamearray.con: In state `error': - // source/lunatic/test/gamearray.con:36: error: symbol `1' is not a game variable. + // error: symbol `1' is not a game variable. ends onevent EVENT_ENTERLEVEL diff --git a/source/duke3d/src/m32exec.cpp b/source/duke3d/src/m32exec.cpp index 89030d583..b279b0608 100644 --- a/source/duke3d/src/m32exec.cpp +++ b/source/duke3d/src/m32exec.cpp @@ -58,7 +58,7 @@ instype *insptr; int32_t VM_Execute(int32_t once); static instype *x_sortingstateptr; -//#include "m32structures.c" +//#include "m32structures.cpp" #ifdef DEBUGGINGAIDS void X_Disasm(ofstype beg, int32_t size) diff --git a/source/duke3d/src/m32vars.cpp b/source/duke3d/src/m32vars.cpp index 12b9eca12..f8bdbd497 100644 --- a/source/duke3d/src/m32vars.cpp +++ b/source/duke3d/src/m32vars.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #endif #define _m32vars_c_ -#include "m32structures.c" +#include "m32structures.cpp" static void Gv_Clear(void) { diff --git a/source/duke3d/src/menus.cpp b/source/duke3d/src/menus.cpp index 6cd9bc657..31cf51297 100644 --- a/source/duke3d/src/menus.cpp +++ b/source/duke3d/src/menus.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include -#include "android/in_android.h" +#include "in_android.h" #ifndef __ANDROID__ droidinput_t droidinput; #endif diff --git a/source/duke3d/src/osdcmds.cpp b/source/duke3d/src/osdcmds.cpp index 6c8b16a1f..a7048310c 100644 --- a/source/duke3d/src/osdcmds.cpp +++ b/source/duke3d/src/osdcmds.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #endif #ifdef EDUKE32_TOUCH_DEVICES -#include "android/in_android.h" +#include "in_android.h" #endif struct osdcmd_cheatsinfo osdcmd_cheatsinfo_stat; diff --git a/source/duke3d/src/player.h b/source/duke3d/src/player.h index 537b8f11d..f948151f1 100644 --- a/source/duke3d/src/player.h +++ b/source/duke3d/src/player.h @@ -129,7 +129,7 @@ typedef struct { // * char --> int8_t // Need to carefully think about implications! // TODO: rearrange this if the opportunity arises! -// KEEPINSYNC lunatic/defs.ilua +// KEEPINSYNC lunatic/_defs_game.lua typedef struct { vec3_t pos, opos, vel, npos; vec2_t bobpos, fric; @@ -206,7 +206,7 @@ typedef struct { int8_t padding_; } DukePlayer_t; -// KEEPINSYNC lunatic/defs.ilua +// KEEPINSYNC lunatic/_defs_game.lua typedef struct { DukePlayer_t *ps; input_t *inputBits; @@ -290,7 +290,7 @@ typedef struct { int32_t userdata; // 4b } projectile_t; -// KEEPINSYNC lunatic/defs.ilua +// KEEPINSYNC lunatic/_defs_game.lua typedef struct { int32_t cur, count; // "cur" is the only member that is *used* int32_t gunposx, lookhalfang; // weapon_xoffset, ps->look_ang>>1 @@ -322,7 +322,7 @@ static inline int A_Shoot(int spriteNum, int projecTile) static inline void P_PalFrom(DukePlayer_t *pPlayer, uint8_t f, uint8_t r, uint8_t g, uint8_t b) { #ifdef LUNATIC - // Compare with defs.ilua: player[]:_palfrom(). + // Compare with _defs_game.lua: player[]:_palfrom(). if (pPlayer->pals.f == 0 || pPlayer->palsfadeprio <= 0) #endif { diff --git a/source/etcpak/include/ProcessRGB.h b/source/etcpak/include/ProcessRGB.h index de8da332d..00b036d51 100644 --- a/source/etcpak/include/ProcessRGB.h +++ b/source/etcpak/include/ProcessRGB.h @@ -1,14 +1,18 @@ -#ifndef PROCESSRGB_HPP__ -#define PROCESSRGB_HPP__ +#ifndef PROCESSRGB_H_ +#define PROCESSRGB_H_ -#include "Types.hpp" +#if !defined __cplusplus || __cplusplus < 201103L +# include +#else +# include +#endif #ifdef __cplusplus extern "C" { #endif -uint64 ProcessRGB( const uint8* src ); -uint64 ProcessRGB_ETC2( const uint8* src ); +uint64_t ProcessRGB( const uint8_t * src ); +uint64_t ProcessRGB_ETC2( const uint8_t * src ); #ifdef __cplusplus } diff --git a/source/etcpak/src/ProcessRGB.cpp b/source/etcpak/src/ProcessRGB.cpp index 575f05563..b4669d64a 100644 --- a/source/etcpak/src/ProcessRGB.cpp +++ b/source/etcpak/src/ProcessRGB.cpp @@ -3,7 +3,7 @@ #include "Math.hpp" #include "ProcessCommon.hpp" -#include "ProcessRGB.hpp" +#include "ProcessRGB.h" #include "Tables.hpp" #include "Types.hpp" #include "Vector.hpp" diff --git a/source/kenbuild/rsrc/build_icon.c b/source/kenbuild/rsrc/build_icon.c index dea3aa2bc..16ca3e1f8 100644 --- a/source/kenbuild/rsrc/build_icon.c +++ b/source/kenbuild/rsrc/build_icon.c @@ -1,9 +1,9 @@ /* GIMP RGBA C-Source image dump (build_icon.c) */ -#include "compat.h" +#include "sdl_inc.h" #include "sdlappicon.h" -static uint8_t sdlappicon_pixels[] = { +static Uint8 sdlappicon_pixels[] = { "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" diff --git a/source/kenbuild/rsrc/game32_icon.c b/source/kenbuild/rsrc/game32_icon.c index 85583508a..aa71e7fe1 100644 --- a/source/kenbuild/rsrc/game32_icon.c +++ b/source/kenbuild/rsrc/game32_icon.c @@ -1,9 +1,9 @@ /* GIMP RGBA C-Source image dump (game_icon.c) */ -#include "compat.h" +#include "sdl_inc.h" #include "sdlappicon.h" -static uint8_t sdlappicon_pixels[] = { +static Uint8 sdlappicon_pixels[] = { "z_A\377\\J6\377\\J6\377\206t`\377\214zf\377\214zf\377\214zf\377\214zf\377" "\214zf\377\214zf\377\214zf\377\214zf\377\214zf\377\214zf\377\214zf\377\214" "zf\377\214zf\377\214zf\377\214zf\377\214zf\377\214zf\377\214zf\377\214zf" diff --git a/source/kenbuild/rsrc/game_icon.c b/source/kenbuild/rsrc/game_icon.c index 9b40ddc92..f4a2425e0 100644 --- a/source/kenbuild/rsrc/game_icon.c +++ b/source/kenbuild/rsrc/game_icon.c @@ -1,9 +1,9 @@ /* GIMP RGBA C-Source image dump (game_icon.c) */ -#include "compat.h" +#include "sdl_inc.h" #include "sdlappicon.h" -static uint8_t sdlappicon_pixels[] = { +static Uint8 sdlappicon_pixels[] = { "\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0" "\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0" "\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0\230tL\0" diff --git a/source/mact/include/_control.h b/source/mact/include/_control.h index e7b4f1566..128cf421d 100644 --- a/source/mact/include/_control.h +++ b/source/mact/include/_control.h @@ -66,17 +66,17 @@ extern "C" { //#define MAXMOUSEBUTTONS 10 // Number of Mouse Axes -// KEEPINSYNC source/gamedefs.h, build/src/sdlayer.c +// KEEPINSYNC duke3d/src/gamedefs.h, build/src/sdlayer.cpp #define MAXMOUSEAXES 2 #define MAXMOUSEDIGITAL (MAXMOUSEAXES*2) // Number of JOY buttons -// KEEPINSYNC source/gamedefs.h, build/src/sdlayer.c +// KEEPINSYNC duke3d/src/gamedefs.h, build/src/sdlayer.cpp #define MAXJOYBUTTONS 32 #define MAXJOYBUTTONSANDHATS (MAXJOYBUTTONS+4) // Number of JOY axes -// KEEPINSYNC source/gamedefs.h, build/src/sdlayer.c +// KEEPINSYNC duke3d/src/gamedefs.h, build/src/sdlayer.cpp #define MAXJOYAXES 9 #define MAXJOYDIGITAL (MAXJOYAXES*2) diff --git a/source/sw/Dependencies.mak b/source/sw/Dependencies.mak index 7823a77db..1d95be107 100644 --- a/source/sw/Dependencies.mak +++ b/source/sw/Dependencies.mak @@ -1,90 +1,90 @@ build_h=$(ENGINE_INC)/build.h $(ENGINE_INC)/compat.h -panel_h=$(SW_INC)/panel.h $(SW_INC)/mytypes.h $(SW_INC)/game.h $(SW_INC)/conpic.h -names2_h=$(SW_INC)/names2.h $(SW_INC)/names.h -game_h=$(SW_INC)/game.h $(SW_INC)/mytypes.h $(MACT_ROOT)/keyboard.h $(SW_INC)/sounds.h $(SW_INC)/settings.h $(SW_INC)/digi.h $(SW_INC)/damage.h $(SW_INC)/inv.h $(SW_INC)/stag.h -tags_h=$(SW_INC)/tags.h $(SW_INC)/jtags.h +panel_h=$(SW_SRC)/panel.h $(SW_SRC)/mytypes.h $(SW_SRC)/game.h $(SW_SRC)/conpic.h +names2_h=$(SW_SRC)/names2.h $(SW_SRC)/names.h +game_h=$(SW_SRC)/game.h $(SW_SRC)/mytypes.h $(MACT_INC)/keyboard.h $(SW_SRC)/sounds.h $(SW_SRC)/settings.h $(SW_SRC)/digi.h $(SW_SRC)/damage.h $(SW_SRC)/inv.h $(SW_SRC)/stag.h +tags_h=$(SW_SRC)/tags.h $(SW_SRC)/jtags.h -$(SW_OBJ)/actor.$o: $(SW_SRC)/actor.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/weapon.h $(SW_INC)/sprite.h $(SW_INC)/actor.h $(SW_INC)/saveable.h -$(SW_OBJ)/ai.$o: $(SW_SRC)/ai.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_INC)/ninja.h $(SW_INC)/ai.h $(SW_INC)/sector.h $(SW_INC)/sprite.h $(SW_INC)/net.h $(SW_INC)/saveable.h -$(SW_OBJ)/anim.$o: $(SW_SRC)/anim.c $(build_h) $(SW_INC)/keys.h $(SW_INC)/mytypes.h $(AUDIOLIB_INC)/fx_man.h $(AUDIOLIB_INC)/music.h $(MACT_ROOT)/scriplib.h $(MACT_ROOT)/file_lib.h $(SW_INC)/gamedefs.h $(MACT_ROOT)/keyboard.h $(MACT_ROOT)/control.h $(SW_INC)/config.h $(SW_INC)/sounds.h $(SW_INC)/function.h $(MACT_ROOT)/animlib.h $(SW_INC)/anim.h $(game_h) $(SW_INC)/colormap.h $(SW_INC)/net.h -$(SW_OBJ)/border.$o: $(SW_SRC)/border.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(SW_INC)/lists.h $(game_h) $(SW_INC)/net.h $(SW_INC)/text.h -$(SW_OBJ)/break.$o: $(SW_SRC)/break.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/break.h $(SW_INC)/sprite.h $(SW_INC)/sector.h $(SW_INC)/light.h $(SW_INC)/weapon.h -$(SW_OBJ)/bunny.$o: $(SW_SRC)/bunny.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/pal.h $(SW_INC)/sprite.h $(SW_INC)/actor.h $(SW_INC)/weapon.h $(SW_INC)/track.h $(SW_INC)/saveable.h -$(SW_OBJ)/cache.$o: $(SW_SRC)/cache.c $(build_h) $(names2_h) $(game_h) $(tags_h) $(SW_INC)/break.h $(SW_INC)/quake.h $(SW_INC)/pal.h $(SW_INC)/cache.h $(SW_INC)/sounds.h $(SW_INC)/net.h -$(SW_OBJ)/cd.$o: $(SW_SRC)/cd.c $(SW_INC)/mytypes.h $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/player.h $(SW_INC)/lists.h $(SW_INC)/warp.h $(SW_INC)/quake.h $(SW_INC)/function.h $(MACT_ROOT)/control.h $(SW_INC)/trigger.h $(SW_INC)/savedef.h $(SW_INC)/menus.h $(SW_INC)/net.h $(SW_INC)/pal.h -$(SW_OBJ)/cheats.$o: $(SW_SRC)/cheats.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_INC)/mytypes.h $(MACT_ROOT)/control.h $(SW_INC)/function.h $(SW_INC)/text.h -$(SW_OBJ)/colormap.$o: $(SW_SRC)/colormap.c $(build_h) $(SW_INC)/keys.h $(SW_INC)/pal.h $(game_h) -$(SW_OBJ)/config.$o: $(SW_SRC)/config.c $(build_h) $(SW_INC)/settings.h $(SW_INC)/mytypes.h $(MACT_ROOT)/scriplib.h $(MACT_ROOT)/file_lib.h $(SW_INC)/gamedefs.h $(MACT_ROOT)/keyboard.h $(SW_INC)/function.h $(MACT_ROOT)/control.h $(AUDIOLIB_INC)/fx_man.h $(SW_INC)/sounds.h $(SW_INC)/config.h $(SW_INC)/common_game.h $(SW_INC)/_functio.h $(SW_INC)/_config.h -$(SW_OBJ)/console.$o: $(SW_SRC)/console.c $(build_h) $(SW_INC)/mytypes.h $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/player.h $(SW_INC)/lists.h $(SW_INC)/warp.h $(SW_INC)/quake.h $(SW_INC)/function.h $(MACT_ROOT)/control.h $(SW_INC)/trigger.h $(SW_INC)/savedef.h $(SW_INC)/menus.h $(SW_INC)/net.h $(SW_INC)/pal.h $(SW_INC)/weapon.h $(SW_INC)/text.h $(SW_INC)/jsector.h -$(SW_OBJ)/coolg.$o: $(SW_SRC)/coolg.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/sprite.h $(SW_INC)/actor.h $(SW_INC)/weapon.h $(SW_INC)/track.h $(SW_INC)/saveable.h -$(SW_OBJ)/coolie.$o: $(SW_SRC)/coolie.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/sprite.h $(SW_INC)/actor.h $(SW_INC)/track.h $(SW_INC)/weapon.h $(SW_INC)/saveable.h -$(SW_OBJ)/copysect.$o: $(SW_SRC)/copysect.c $(build_h) $(names2_h) $(game_h) $(tags_h) $(SW_INC)/weapon.h $(SW_INC)/sprite.h $(SW_INC)/track.h -$(SW_OBJ)/demo.$o: $(SW_SRC)/demo.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_INC)/net.h $(SW_INC)/mytypes.h $(MACT_ROOT)/control.h $(SW_INC)/function.h $(SW_INC)/demo.h $(SW_INC)/player.h $(SW_INC)/menus.h -$(SW_OBJ)/draw.$o: $(SW_SRC)/draw.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_INC)/quake.h $(SW_INC)/vis.h $(SW_INC)/jsector.h $(SW_INC)/reserve.h $(SW_INC)/mytypes.h $(MACT_ROOT)/control.h $(SW_INC)/function.h $(SW_INC)/net.h $(SW_INC)/pal.h $(SW_INC)/player.h $(SW_INC)/jtags.h $(SW_INC)/parent.h $(SW_INC)/cache.h $(SW_INC)/text.h $(SW_INC)/menus.h $(SW_INC)/interp.h $(SW_INC)/sector.h -$(SW_OBJ)/eel.$o: $(SW_SRC)/eel.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/actor.h $(SW_INC)/weapon.h $(SW_INC)/track.h $(SW_INC)/saveable.h -$(SW_OBJ)/game.$o: $(SW_SRC)/game.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/sector.h $(SW_INC)/sprite.h $(SW_INC)/weapon.h $(SW_INC)/player.h $(SW_INC)/lists.h $(SW_INC)/net.h $(SW_INC)/pal.h $(AUDIOLIB_INC)/fx_man.h $(SW_INC)/mytypes.h $(SW_INC)/menus.h $(MACT_ROOT)/control.h $(SW_INC)/function.h $(SW_INC)/demo.h $(SW_INC)/cache.h $(SW_INC)/anim.h $(SW_INC)/colormap.h $(SW_INC)/break.h $(SW_INC)/ninja.h $(SW_INC)/light.h $(SW_INC)/track.h $(SW_INC)/jsector.h $(MACT_ROOT)/keyboard.h $(SW_INC)/text.h $(AUDIOLIB_INC)/music.h $(SW_INC)/saveable.h -$(SW_OBJ)/girlninj.$o: $(SW_SRC)/girlninj.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/pal.h $(SW_INC)/player.h $(SW_INC)/net.h $(SW_INC)/actor.h $(SW_INC)/track.h $(SW_INC)/sprite.h $(SW_INC)/saveable.h -$(SW_OBJ)/goro.$o: $(SW_SRC)/goro.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/actor.h $(SW_INC)/track.h $(SW_INC)/saveable.h -$(SW_OBJ)/hornet.$o: $(SW_SRC)/hornet.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/actor.h $(SW_INC)/weapon.h $(SW_INC)/track.h $(SW_INC)/sprite.h $(SW_INC)/saveable.h -$(SW_OBJ)/interp.$o: $(SW_SRC)/interp.c $(SW_INC)/interp.h -$(SW_OBJ)/interpsh.$o: $(SW_SRC)/interpsh.c $(SW_INC)/interp.h -$(SW_OBJ)/inv.$o: $(SW_SRC)/inv.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_INC)/pal.h $(SW_INC)/text.h $(SW_INC)/colormap.h $(SW_INC)/player.h -$(SW_OBJ)/jplayer.$o: $(SW_SRC)/jplayer.c $(build_h) $(SW_INC)/mytypes.h $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/player.h $(SW_INC)/lists.h $(SW_INC)/warp.h $(SW_INC)/quake.h $(SW_INC)/function.h $(MACT_ROOT)/control.h $(SW_INC)/trigger.h $(SW_INC)/savedef.h $(SW_INC)/menus.h $(SW_INC)/net.h $(SW_INC)/pal.h $(SW_INC)/bots.h -$(SW_OBJ)/jsector.$o: $(SW_SRC)/jsector.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(SW_INC)/jnames.h $(panel_h) $(game_h) $(tags_h) $(SW_INC)/sector.h $(SW_INC)/player.h $(SW_INC)/sprite.h $(SW_INC)/reserve.h $(SW_INC)/jsector.h $(SW_INC)/jtags.h $(SW_INC)/lists.h $(SW_INC)/pal.h $(SW_INC)/parent.h -$(SW_OBJ)/jweapon.$o: $(SW_SRC)/jweapon.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/break.h $(SW_INC)/quake.h $(SW_INC)/net.h $(SW_INC)/pal.h $(SW_INC)/ai.h $(SW_INC)/weapon.h $(SW_INC)/sprite.h $(SW_INC)/sector.h $(SW_INC)/actor.h $(SW_INC)/saveable.h -$(SW_OBJ)/lava.$o: $(SW_SRC)/lava.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/actor.h $(SW_INC)/track.h -$(SW_OBJ)/light.$o: $(SW_SRC)/light.c $(build_h) $(names2_h) $(game_h) $(SW_INC)/light.h -$(SW_OBJ)/mclip.$o: $(SW_SRC)/mclip.c $(build_h) $(SW_INC)/mytypes.h $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/player.h $(SW_INC)/mclip.h -$(SW_OBJ)/mdastr.$o: $(SW_SRC)/mdastr.c $(build_h) $(SW_INC)/mytypes.h $(SW_INC)/keys.h $(names2_h) $(game_h) -$(SW_OBJ)/menus.$o: $(SW_SRC)/menus.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/sector.h $(SW_INC)/sprite.h $(SW_INC)/weapon.h $(SW_INC)/player.h $(SW_INC)/jsector.h $(SW_INC)/reserve.h $(MACT_ROOT)/control.h $(SW_INC)/menus.h $(SW_INC)/sw_strs.h $(SW_INC)/pal.h $(SW_INC)/function.h $(SW_INC)/net.h $(AUDIOLIB_INC)/fx_man.h $(AUDIOLIB_INC)/music.h $(SW_INC)/text.h $(SW_INC)/colormap.h -$(SW_OBJ)/miscactr.$o: $(SW_SRC)/miscactr.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/quake.h $(AUDIOLIB_INC)/fx_man.h $(SW_INC)/actor.h $(SW_INC)/sector.h $(SW_INC)/sprite.h $(SW_INC)/saveable.h -$(SW_OBJ)/morph.$o: $(SW_SRC)/morph.c $(build_h) $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/sector.h $(SW_INC)/ai.h $(SW_INC)/player.h $(SW_INC)/saveable.h -$(SW_OBJ)/net.$o: $(SW_SRC)/net.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(tags_h) $(game_h) $(SW_INC)/net.h $(SW_INC)/pal.h $(SW_INC)/weapon.h $(SW_INC)/text.h $(SW_INC)/menus.h -$(SW_OBJ)/ninja.$o: $(SW_SRC)/ninja.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/pal.h $(SW_INC)/player.h $(SW_INC)/net.h $(SW_INC)/weapon.h $(SW_INC)/track.h $(SW_INC)/actor.h $(SW_INC)/ninja.h $(SW_INC)/sprite.h $(SW_INC)/saveable.h -$(SW_OBJ)/panel.$o: $(SW_SRC)/panel.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(SW_INC)/lists.h $(game_h) $(SW_INC)/net.h $(SW_INC)/pal.h $(SW_INC)/vis.h $(SW_INC)/weapon.h $(AUDIOLIB_INC)/fx_man.h $(SW_INC)/text.h $(SW_INC)/player.h $(SW_INC)/saveable.h -$(SW_OBJ)/player.$o: $(SW_SRC)/player.c $(build_h) $(SW_INC)/mytypes.h $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/player.h $(SW_INC)/lists.h $(SW_INC)/warp.h $(SW_INC)/quake.h $(SW_INC)/text.h $(SW_INC)/function.h $(MACT_ROOT)/control.h $(SW_INC)/trigger.h $(SW_INC)/savedef.h $(SW_INC)/menus.h $(SW_INC)/net.h $(SW_INC)/pal.h $(SW_INC)/demo.h $(SW_INC)/mclip.h $(AUDIOLIB_INC)/fx_man.h $(SW_INC)/sprite.h $(SW_INC)/weapon.h $(SW_INC)/ninja.h $(SW_INC)/break.h $(SW_INC)/jsector.h $(SW_INC)/sector.h $(SW_INC)/actor.h $(SW_INC)/colormap.h $(AUDIOLIB_INC)/music.h $(SW_INC)/vis.h $(SW_INC)/track.h $(SW_INC)/interp.h $(SW_INC)/saveable.h -$(SW_OBJ)/predict.$o: $(SW_SRC)/predict.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_INC)/net.h -$(SW_OBJ)/quake.$o: $(SW_SRC)/quake.c $(build_h) $(names2_h) $(game_h) $(tags_h) $(SW_INC)/break.h $(SW_INC)/quake.h $(SW_INC)/sprite.h $(SW_INC)/saveable.h -$(SW_OBJ)/ripper.$o: $(SW_SRC)/ripper.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/pal.h $(SW_INC)/actor.h $(SW_INC)/sprite.h $(SW_INC)/track.h $(SW_INC)/saveable.h -$(SW_OBJ)/ripper2.$o: $(SW_SRC)/ripper2.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/pal.h $(SW_INC)/actor.h $(SW_INC)/sprite.h $(SW_INC)/track.h $(AUDIOLIB_INC)/fx_man.h $(SW_INC)/saveable.h -$(SW_OBJ)/rooms.$o: $(SW_SRC)/rooms.c $(build_h) $(names2_h) $(panel_h) $(game_h) $(SW_INC)/warp.h -$(SW_OBJ)/rotator.$o: $(SW_SRC)/rotator.c $(build_h) $(names2_h) $(panel_h) $(game_h) $(SW_INC)/net.h $(tags_h) $(SW_INC)/sector.h $(SW_INC)/text.h $(SW_INC)/interp.h $(SW_INC)/sprite.h $(SW_INC)/saveable.h -$(SW_OBJ)/rts.$o: $(SW_SRC)/rts.c $(SW_INC)/mytypes.h $(MACT_ROOT)/file_lib.h $(SW_INC)/_rts.h $(SW_INC)/rts.h $(SW_INC)/cache.h -$(SW_OBJ)/save.$o: $(SW_SRC)/save.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/lists.h $(SW_INC)/interp.h $(SW_INC)/net.h $(SW_INC)/savedef.h $(SW_INC)/jsector.h $(SW_INC)/parent.h $(SW_INC)/reserve.h $(SW_INC)/mfile.h $(SW_INC)/weapon.h $(SW_INC)/cache.h $(SW_INC)/colormap.h $(SW_INC)/player.h $(AUDIOLIB_INC)/fx_man.h $(AUDIOLIB_INC)/music.h $(SW_INC)/saveable.h -$(SW_OBJ)/scrip2.$o: $(SW_SRC)/scrip2.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_INC)/parse.h $(SW_INC)/jsector.h $(SW_INC)/parent.h -$(SW_OBJ)/sector.$o: $(SW_SRC)/sector.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/sector.h $(SW_INC)/player.h $(SW_INC)/quake.h $(SW_INC)/weapon.h $(SW_INC)/jtags.h $(SW_INC)/net.h $(SW_INC)/break.h $(SW_INC)/track.h $(SW_INC)/sprite.h $(SW_INC)/light.h $(SW_INC)/text.h -$(SW_OBJ)/serp.$o: $(SW_SRC)/serp.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/actor.h $(SW_INC)/track.h $(SW_INC)/sector.h -$(SW_OBJ)/setup.$o: $(SW_SRC)/setup.c $(build_h) $(SW_INC)/keys.h $(game_h) $(SW_INC)/mytypes.h $(AUDIOLIB_INC)/fx_man.h $(AUDIOLIB_INC)/music.h $(MACT_ROOT)/scriplib.h $(MACT_ROOT)/file_lib.h $(SW_INC)/gamedefs.h $(MACT_ROOT)/keyboard.h $(MACT_ROOT)/control.h $(SW_INC)/config.h $(SW_INC)/sounds.h $(SW_INC)/function.h $(SW_INC)/rts.h -$(SW_OBJ)/skel.$o: $(SW_SRC)/skel.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/actor.h $(SW_INC)/track.h -$(SW_OBJ)/skull.$o: $(SW_SRC)/skull.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/weapon.h $(SW_INC)/actor.h -$(SW_OBJ)/slidor.$o: $(SW_SRC)/slidor.c $(build_h) $(names2_h) $(panel_h) $(game_h) $(SW_INC)/net.h $(tags_h) $(SW_INC)/slidor.h $(SW_INC)/slidor.h $(SW_INC)/sector.h $(SW_INC)/interp.h $(SW_INC)/text.h $(SW_INC)/sprite.h $(SW_INC)/saveable.h -$(SW_OBJ)/sounds.$o: $(SW_SRC)/sounds.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(SW_INC)/mytypes.h $(AUDIOLIB_INC)/fx_man.h $(AUDIOLIB_INC)/music.h $(SW_INC)/gamedefs.h $(SW_INC)/config.h $(panel_h) $(game_h) $(SW_INC)/sounds.h $(SW_INC)/ai.h $(SW_INC)/net.h $(SW_INC)/cache.h $(SW_INC)/text.h $(SW_INC)/rts.h $(SW_INC)/menus.h -$(SW_OBJ)/spike.$o: $(SW_SRC)/spike.c $(build_h) $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/sector.h $(SW_INC)/sprite.h $(SW_INC)/saveable.h -$(SW_OBJ)/sprite.$o: $(SW_SRC)/sprite.c $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/warp.h $(SW_INC)/light.h $(SW_INC)/break.h $(SW_INC)/net.h $(SW_INC)/pal.h $(SW_INC)/sounds.h $(SW_INC)/interp.h $(SW_INC)/sprite.h $(SW_INC)/weapon.h $(SW_INC)/jsector.h $(SW_INC)/text.h $(SW_INC)/slidor.h $(SW_INC)/player.h $(SW_INC)/saveable.h -$(SW_OBJ)/sumo.$o: $(SW_SRC)/sumo.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/quake.h $(SW_INC)/actor.h $(SW_INC)/track.h $(SW_INC)/weapon.h $(SW_INC)/sector.h -$(SW_OBJ)/swconfig.$o: $(SW_SRC)/swconfig.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_INC)/mytypes.h $(MACT_ROOT)/scriplib.h $(AUDIOLIB_INC)/fx_man.h $(SW_INC)/gamedefs.h $(SW_INC)/common_game.h $(SW_INC)/config.h $(SW_INC)/function.h $(SW_INC)/rts.h -$(SW_OBJ)/sync.$o: $(SW_SRC)/sync.c $(SW_INC)/keys.h $(game_h) $(tags_h) $(names2_h) $(SW_INC)/net.h $(SW_INC)/menus.h -$(SW_OBJ)/text.$o: $(SW_SRC)/text.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(SW_INC)/lists.h $(game_h) $(SW_INC)/pal.h $(SW_INC)/text.h $(SW_INC)/net.h -$(SW_OBJ)/timer.$o: $(SW_SRC)/timer.c $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/sector.h $(SW_INC)/sprite.h $(SW_INC)/weapon.h $(AUDIOLIB_INC)/fx_man.h $(AUDIOLIB_INC)/music.h $(SW_INC)/audiofx.h -$(SW_OBJ)/track.$o: $(SW_SRC)/track.c $(build_h) $(names2_h) $(panel_h) $(tags_h) $(SW_INC)/sector.h $(SW_INC)/ai.h $(SW_INC)/player.h $(game_h) $(SW_INC)/net.h $(SW_INC)/sprite.h $(SW_INC)/track.h $(SW_INC)/weapon.h $(SW_INC)/saveable.h -$(SW_OBJ)/vator.$o: $(SW_SRC)/vator.c $(build_h) $(names2_h) $(panel_h) $(game_h) $(SW_INC)/net.h $(tags_h) $(SW_INC)/sector.h $(SW_INC)/interp.h $(SW_INC)/text.h $(SW_INC)/sprite.h $(SW_INC)/weapon.h $(SW_INC)/saveable.h -$(SW_OBJ)/vis.$o: $(SW_SRC)/vis.c $(build_h) $(names2_h) $(game_h) $(tags_h) $(SW_INC)/break.h $(SW_INC)/quake.h $(SW_INC)/pal.h $(SW_INC)/sprite.h -$(SW_OBJ)/wallmove.$o: $(SW_SRC)/wallmove.c $(build_h) $(names2_h) $(game_h) $(tags_h) $(SW_INC)/weapon.h $(SW_INC)/sprite.h -$(SW_OBJ)/warp.$o: $(SW_SRC)/warp.c $(build_h) $(names2_h) $(panel_h) $(game_h) $(SW_INC)/warp.h -$(SW_OBJ)/weapon.$o: $(SW_SRC)/weapon.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/break.h $(SW_INC)/quake.h $(SW_INC)/net.h $(SW_INC)/pal.h $(SW_INC)/vis.h $(SW_INC)/ai.h $(SW_INC)/weapon.h $(SW_INC)/anim.h $(SW_INC)/damage.h $(SW_INC)/sector.h $(SW_INC)/sprite.h $(SW_INC)/actor.h $(SW_INC)/track.h $(SW_INC)/player.h -$(SW_OBJ)/zilla.$o: $(SW_SRC)/zilla.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/quake.h $(SW_INC)/actor.h $(SW_INC)/track.h $(AUDIOLIB_INC)/fx_man.h -$(SW_OBJ)/zombie.$o: $(SW_SRC)/zombie.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_INC)/ai.h $(SW_INC)/pal.h $(SW_INC)/player.h $(SW_INC)/net.h $(SW_INC)/sprite.h $(SW_INC)/weapon.h $(SW_INC)/actor.h $(SW_INC)/track.h -$(SW_OBJ)/saveable.$o: $(SW_SRC)/saveable.c $(ENGINE_INC)/compat.h $(SW_INC)/saveable.h +$(SW_OBJ)/actor.$o: $(SW_SRC)/actor.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/weapon.h $(SW_SRC)/sprite.h $(SW_SRC)/actor.h $(SW_SRC)/saveable.h +$(SW_OBJ)/ai.$o: $(SW_SRC)/ai.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/ninja.h $(SW_SRC)/ai.h $(SW_SRC)/sector.h $(SW_SRC)/sprite.h $(SW_SRC)/net.h $(SW_SRC)/saveable.h +$(SW_OBJ)/anim.$o: $(SW_SRC)/anim.cpp $(build_h) $(SW_SRC)/keys.h $(SW_SRC)/mytypes.h $(AUDIOLIB_INC)/fx_man.h $(AUDIOLIB_INC)/music.h $(MACT_INC)/scriplib.h $(MACT_INC)/file_lib.h $(SW_SRC)/gamedefs.h $(MACT_INC)/keyboard.h $(MACT_INC)/control.h $(SW_SRC)/config.h $(SW_SRC)/sounds.h $(SW_SRC)/function.h $(MACT_INC)/animlib.h $(SW_SRC)/anim.h $(game_h) $(SW_SRC)/colormap.h $(SW_SRC)/net.h +$(SW_OBJ)/border.$o: $(SW_SRC)/border.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(SW_SRC)/lists.h $(game_h) $(SW_SRC)/net.h $(SW_SRC)/text.h +$(SW_OBJ)/break.$o: $(SW_SRC)/break.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/break.h $(SW_SRC)/sprite.h $(SW_SRC)/sector.h $(SW_SRC)/light.h $(SW_SRC)/weapon.h +$(SW_OBJ)/bunny.$o: $(SW_SRC)/bunny.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/pal.h $(SW_SRC)/sprite.h $(SW_SRC)/actor.h $(SW_SRC)/weapon.h $(SW_SRC)/track.h $(SW_SRC)/saveable.h +$(SW_OBJ)/cache.$o: $(SW_SRC)/cache.cpp $(build_h) $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/break.h $(SW_SRC)/quake.h $(SW_SRC)/pal.h $(SW_SRC)/cache.h $(SW_SRC)/sounds.h $(SW_SRC)/net.h +$(SW_OBJ)/cd.$o: $(SW_SRC)/cd.cpp $(SW_SRC)/mytypes.h $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/player.h $(SW_SRC)/lists.h $(SW_SRC)/warp.h $(SW_SRC)/quake.h $(SW_SRC)/function.h $(MACT_INC)/control.h $(SW_SRC)/trigger.h $(SW_SRC)/savedef.h $(SW_SRC)/menus.h $(SW_SRC)/net.h $(SW_SRC)/pal.h +$(SW_OBJ)/cheats.$o: $(SW_SRC)/cheats.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_SRC)/mytypes.h $(MACT_INC)/control.h $(SW_SRC)/function.h $(SW_SRC)/text.h +$(SW_OBJ)/colormap.$o: $(SW_SRC)/colormap.cpp $(build_h) $(SW_SRC)/keys.h $(SW_SRC)/pal.h $(game_h) +$(SW_OBJ)/config.$o: $(SW_SRC)/config.cpp $(build_h) $(SW_SRC)/settings.h $(SW_SRC)/mytypes.h $(MACT_INC)/scriplib.h $(MACT_INC)/file_lib.h $(SW_SRC)/gamedefs.h $(MACT_INC)/keyboard.h $(SW_SRC)/function.h $(MACT_INC)/control.h $(AUDIOLIB_INC)/fx_man.h $(SW_SRC)/sounds.h $(SW_SRC)/config.h $(SW_SRC)/common_game.h $(SW_SRC)/_functio.h $(SW_SRC)/_config.h +$(SW_OBJ)/console.$o: $(SW_SRC)/console.cpp $(build_h) $(SW_SRC)/mytypes.h $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/player.h $(SW_SRC)/lists.h $(SW_SRC)/warp.h $(SW_SRC)/quake.h $(SW_SRC)/function.h $(MACT_INC)/control.h $(SW_SRC)/trigger.h $(SW_SRC)/savedef.h $(SW_SRC)/menus.h $(SW_SRC)/net.h $(SW_SRC)/pal.h $(SW_SRC)/weapon.h $(SW_SRC)/text.h $(SW_SRC)/jsector.h +$(SW_OBJ)/coolg.$o: $(SW_SRC)/coolg.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/sprite.h $(SW_SRC)/actor.h $(SW_SRC)/weapon.h $(SW_SRC)/track.h $(SW_SRC)/saveable.h +$(SW_OBJ)/coolie.$o: $(SW_SRC)/coolie.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/sprite.h $(SW_SRC)/actor.h $(SW_SRC)/track.h $(SW_SRC)/weapon.h $(SW_SRC)/saveable.h +$(SW_OBJ)/copysect.$o: $(SW_SRC)/copysect.cpp $(build_h) $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/weapon.h $(SW_SRC)/sprite.h $(SW_SRC)/track.h +$(SW_OBJ)/demo.$o: $(SW_SRC)/demo.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_SRC)/net.h $(SW_SRC)/mytypes.h $(MACT_INC)/control.h $(SW_SRC)/function.h $(SW_SRC)/demo.h $(SW_SRC)/player.h $(SW_SRC)/menus.h +$(SW_OBJ)/draw.$o: $(SW_SRC)/draw.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_SRC)/quake.h $(SW_SRC)/vis.h $(SW_SRC)/jsector.h $(SW_SRC)/reserve.h $(SW_SRC)/mytypes.h $(MACT_INC)/control.h $(SW_SRC)/function.h $(SW_SRC)/net.h $(SW_SRC)/pal.h $(SW_SRC)/player.h $(SW_SRC)/jtags.h $(SW_SRC)/parent.h $(SW_SRC)/cache.h $(SW_SRC)/text.h $(SW_SRC)/menus.h $(SW_SRC)/interp.h $(SW_SRC)/sector.h +$(SW_OBJ)/eel.$o: $(SW_SRC)/eel.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/actor.h $(SW_SRC)/weapon.h $(SW_SRC)/track.h $(SW_SRC)/saveable.h +$(SW_OBJ)/game.$o: $(SW_SRC)/game.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/sector.h $(SW_SRC)/sprite.h $(SW_SRC)/weapon.h $(SW_SRC)/player.h $(SW_SRC)/lists.h $(SW_SRC)/net.h $(SW_SRC)/pal.h $(AUDIOLIB_INC)/fx_man.h $(SW_SRC)/mytypes.h $(SW_SRC)/menus.h $(MACT_INC)/control.h $(SW_SRC)/function.h $(SW_SRC)/demo.h $(SW_SRC)/cache.h $(SW_SRC)/anim.h $(SW_SRC)/colormap.h $(SW_SRC)/break.h $(SW_SRC)/ninja.h $(SW_SRC)/light.h $(SW_SRC)/track.h $(SW_SRC)/jsector.h $(MACT_INC)/keyboard.h $(SW_SRC)/text.h $(AUDIOLIB_INC)/music.h $(SW_SRC)/saveable.h +$(SW_OBJ)/girlninj.$o: $(SW_SRC)/girlninj.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/pal.h $(SW_SRC)/player.h $(SW_SRC)/net.h $(SW_SRC)/actor.h $(SW_SRC)/track.h $(SW_SRC)/sprite.h $(SW_SRC)/saveable.h +$(SW_OBJ)/goro.$o: $(SW_SRC)/goro.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/actor.h $(SW_SRC)/track.h $(SW_SRC)/saveable.h +$(SW_OBJ)/hornet.$o: $(SW_SRC)/hornet.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/actor.h $(SW_SRC)/weapon.h $(SW_SRC)/track.h $(SW_SRC)/sprite.h $(SW_SRC)/saveable.h +$(SW_OBJ)/interp.$o: $(SW_SRC)/interp.cpp $(SW_SRC)/interp.h +$(SW_OBJ)/interpsh.$o: $(SW_SRC)/interpsh.cpp $(SW_SRC)/interp.h +$(SW_OBJ)/inv.$o: $(SW_SRC)/inv.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_SRC)/pal.h $(SW_SRC)/text.h $(SW_SRC)/colormap.h $(SW_SRC)/player.h +$(SW_OBJ)/jplayer.$o: $(SW_SRC)/jplayer.cpp $(build_h) $(SW_SRC)/mytypes.h $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/player.h $(SW_SRC)/lists.h $(SW_SRC)/warp.h $(SW_SRC)/quake.h $(SW_SRC)/function.h $(MACT_INC)/control.h $(SW_SRC)/trigger.h $(SW_SRC)/savedef.h $(SW_SRC)/menus.h $(SW_SRC)/net.h $(SW_SRC)/pal.h $(SW_SRC)/bots.h +$(SW_OBJ)/jsector.$o: $(SW_SRC)/jsector.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(SW_SRC)/jnames.h $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/sector.h $(SW_SRC)/player.h $(SW_SRC)/sprite.h $(SW_SRC)/reserve.h $(SW_SRC)/jsector.h $(SW_SRC)/jtags.h $(SW_SRC)/lists.h $(SW_SRC)/pal.h $(SW_SRC)/parent.h +$(SW_OBJ)/jweapon.$o: $(SW_SRC)/jweapon.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/break.h $(SW_SRC)/quake.h $(SW_SRC)/net.h $(SW_SRC)/pal.h $(SW_SRC)/ai.h $(SW_SRC)/weapon.h $(SW_SRC)/sprite.h $(SW_SRC)/sector.h $(SW_SRC)/actor.h $(SW_SRC)/saveable.h +$(SW_OBJ)/lava.$o: $(SW_SRC)/lava.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/actor.h $(SW_SRC)/track.h +$(SW_OBJ)/light.$o: $(SW_SRC)/light.cpp $(build_h) $(names2_h) $(game_h) $(SW_SRC)/light.h +$(SW_OBJ)/mclip.$o: $(SW_SRC)/mclip.cpp $(build_h) $(SW_SRC)/mytypes.h $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/player.h $(SW_SRC)/mclip.h +$(SW_OBJ)/mdastr.$o: $(SW_SRC)/mdastr.cpp $(build_h) $(SW_SRC)/mytypes.h $(SW_SRC)/keys.h $(names2_h) $(game_h) +$(SW_OBJ)/menus.$o: $(SW_SRC)/menus.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/sector.h $(SW_SRC)/sprite.h $(SW_SRC)/weapon.h $(SW_SRC)/player.h $(SW_SRC)/jsector.h $(SW_SRC)/reserve.h $(MACT_INC)/control.h $(SW_SRC)/menus.h $(SW_SRC)/sw_strs.h $(SW_SRC)/pal.h $(SW_SRC)/function.h $(SW_SRC)/net.h $(AUDIOLIB_INC)/fx_man.h $(AUDIOLIB_INC)/music.h $(SW_SRC)/text.h $(SW_SRC)/colormap.h +$(SW_OBJ)/miscactr.$o: $(SW_SRC)/miscactr.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/quake.h $(AUDIOLIB_INC)/fx_man.h $(SW_SRC)/actor.h $(SW_SRC)/sector.h $(SW_SRC)/sprite.h $(SW_SRC)/saveable.h +$(SW_OBJ)/morph.$o: $(SW_SRC)/morph.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/sector.h $(SW_SRC)/ai.h $(SW_SRC)/player.h $(SW_SRC)/saveable.h +$(SW_OBJ)/net.$o: $(SW_SRC)/net.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(tags_h) $(game_h) $(SW_SRC)/net.h $(SW_SRC)/pal.h $(SW_SRC)/weapon.h $(SW_SRC)/text.h $(SW_SRC)/menus.h +$(SW_OBJ)/ninja.$o: $(SW_SRC)/ninja.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/pal.h $(SW_SRC)/player.h $(SW_SRC)/net.h $(SW_SRC)/weapon.h $(SW_SRC)/track.h $(SW_SRC)/actor.h $(SW_SRC)/ninja.h $(SW_SRC)/sprite.h $(SW_SRC)/saveable.h +$(SW_OBJ)/panel.$o: $(SW_SRC)/panel.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(SW_SRC)/lists.h $(game_h) $(SW_SRC)/net.h $(SW_SRC)/pal.h $(SW_SRC)/vis.h $(SW_SRC)/weapon.h $(AUDIOLIB_INC)/fx_man.h $(SW_SRC)/text.h $(SW_SRC)/player.h $(SW_SRC)/saveable.h +$(SW_OBJ)/player.$o: $(SW_SRC)/player.cpp $(build_h) $(SW_SRC)/mytypes.h $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/player.h $(SW_SRC)/lists.h $(SW_SRC)/warp.h $(SW_SRC)/quake.h $(SW_SRC)/text.h $(SW_SRC)/function.h $(MACT_INC)/control.h $(SW_SRC)/trigger.h $(SW_SRC)/savedef.h $(SW_SRC)/menus.h $(SW_SRC)/net.h $(SW_SRC)/pal.h $(SW_SRC)/demo.h $(SW_SRC)/mclip.h $(AUDIOLIB_INC)/fx_man.h $(SW_SRC)/sprite.h $(SW_SRC)/weapon.h $(SW_SRC)/ninja.h $(SW_SRC)/break.h $(SW_SRC)/jsector.h $(SW_SRC)/sector.h $(SW_SRC)/actor.h $(SW_SRC)/colormap.h $(AUDIOLIB_INC)/music.h $(SW_SRC)/vis.h $(SW_SRC)/track.h $(SW_SRC)/interp.h $(SW_SRC)/saveable.h +$(SW_OBJ)/predict.$o: $(SW_SRC)/predict.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_SRC)/net.h +$(SW_OBJ)/quake.$o: $(SW_SRC)/quake.cpp $(build_h) $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/break.h $(SW_SRC)/quake.h $(SW_SRC)/sprite.h $(SW_SRC)/saveable.h +$(SW_OBJ)/ripper.$o: $(SW_SRC)/ripper.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/pal.h $(SW_SRC)/actor.h $(SW_SRC)/sprite.h $(SW_SRC)/track.h $(SW_SRC)/saveable.h +$(SW_OBJ)/ripper2.$o: $(SW_SRC)/ripper2.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/pal.h $(SW_SRC)/actor.h $(SW_SRC)/sprite.h $(SW_SRC)/track.h $(AUDIOLIB_INC)/fx_man.h $(SW_SRC)/saveable.h +$(SW_OBJ)/rooms.$o: $(SW_SRC)/rooms.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(SW_SRC)/warp.h +$(SW_OBJ)/rotator.$o: $(SW_SRC)/rotator.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(SW_SRC)/net.h $(tags_h) $(SW_SRC)/sector.h $(SW_SRC)/text.h $(SW_SRC)/interp.h $(SW_SRC)/sprite.h $(SW_SRC)/saveable.h +$(SW_OBJ)/rts.$o: $(SW_SRC)/rts.cpp $(SW_SRC)/mytypes.h $(MACT_INC)/file_lib.h $(SW_SRC)/_rts.h $(SW_SRC)/rts.h $(SW_SRC)/cache.h +$(SW_OBJ)/save.$o: $(SW_SRC)/save.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/lists.h $(SW_SRC)/interp.h $(SW_SRC)/net.h $(SW_SRC)/savedef.h $(SW_SRC)/jsector.h $(SW_SRC)/parent.h $(SW_SRC)/reserve.h $(SW_SRC)/mfile.h $(SW_SRC)/weapon.h $(SW_SRC)/cache.h $(SW_SRC)/colormap.h $(SW_SRC)/player.h $(AUDIOLIB_INC)/fx_man.h $(AUDIOLIB_INC)/music.h $(SW_SRC)/saveable.h +$(SW_OBJ)/scrip2.$o: $(SW_SRC)/scrip2.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_SRC)/parse.h $(SW_SRC)/jsector.h $(SW_SRC)/parent.h +$(SW_OBJ)/sector.$o: $(SW_SRC)/sector.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/sector.h $(SW_SRC)/player.h $(SW_SRC)/quake.h $(SW_SRC)/weapon.h $(SW_SRC)/jtags.h $(SW_SRC)/net.h $(SW_SRC)/break.h $(SW_SRC)/track.h $(SW_SRC)/sprite.h $(SW_SRC)/light.h $(SW_SRC)/text.h +$(SW_OBJ)/serp.$o: $(SW_SRC)/serp.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/actor.h $(SW_SRC)/track.h $(SW_SRC)/sector.h +$(SW_OBJ)/setup.$o: $(SW_SRC)/setup.cpp $(build_h) $(SW_SRC)/keys.h $(game_h) $(SW_SRC)/mytypes.h $(AUDIOLIB_INC)/fx_man.h $(AUDIOLIB_INC)/music.h $(MACT_INC)/scriplib.h $(MACT_INC)/file_lib.h $(SW_SRC)/gamedefs.h $(MACT_INC)/keyboard.h $(MACT_INC)/control.h $(SW_SRC)/config.h $(SW_SRC)/sounds.h $(SW_SRC)/function.h $(SW_SRC)/rts.h +$(SW_OBJ)/skel.$o: $(SW_SRC)/skel.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/actor.h $(SW_SRC)/track.h +$(SW_OBJ)/skull.$o: $(SW_SRC)/skull.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/weapon.h $(SW_SRC)/actor.h +$(SW_OBJ)/slidor.$o: $(SW_SRC)/slidor.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(SW_SRC)/net.h $(tags_h) $(SW_SRC)/slidor.h $(SW_SRC)/slidor.h $(SW_SRC)/sector.h $(SW_SRC)/interp.h $(SW_SRC)/text.h $(SW_SRC)/sprite.h $(SW_SRC)/saveable.h +$(SW_OBJ)/sounds.$o: $(SW_SRC)/sounds.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(SW_SRC)/mytypes.h $(AUDIOLIB_INC)/fx_man.h $(AUDIOLIB_INC)/music.h $(SW_SRC)/gamedefs.h $(SW_SRC)/config.h $(panel_h) $(game_h) $(SW_SRC)/sounds.h $(SW_SRC)/ai.h $(SW_SRC)/net.h $(SW_SRC)/cache.h $(SW_SRC)/text.h $(SW_SRC)/rts.h $(SW_SRC)/menus.h +$(SW_OBJ)/spike.$o: $(SW_SRC)/spike.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/sector.h $(SW_SRC)/sprite.h $(SW_SRC)/saveable.h +$(SW_OBJ)/sprite.$o: $(SW_SRC)/sprite.cpp $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/warp.h $(SW_SRC)/light.h $(SW_SRC)/break.h $(SW_SRC)/net.h $(SW_SRC)/pal.h $(SW_SRC)/sounds.h $(SW_SRC)/interp.h $(SW_SRC)/sprite.h $(SW_SRC)/weapon.h $(SW_SRC)/jsector.h $(SW_SRC)/text.h $(SW_SRC)/slidor.h $(SW_SRC)/player.h $(SW_SRC)/saveable.h +$(SW_OBJ)/sumo.$o: $(SW_SRC)/sumo.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/quake.h $(SW_SRC)/actor.h $(SW_SRC)/track.h $(SW_SRC)/weapon.h $(SW_SRC)/sector.h +$(SW_OBJ)/swconfig.$o: $(SW_SRC)/swconfig.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(SW_SRC)/mytypes.h $(MACT_INC)/scriplib.h $(AUDIOLIB_INC)/fx_man.h $(SW_SRC)/gamedefs.h $(SW_SRC)/common_game.h $(SW_SRC)/config.h $(SW_SRC)/function.h $(SW_SRC)/rts.h +$(SW_OBJ)/sync.$o: $(SW_SRC)/sync.cpp $(SW_SRC)/keys.h $(game_h) $(tags_h) $(names2_h) $(SW_SRC)/net.h $(SW_SRC)/menus.h +$(SW_OBJ)/text.$o: $(SW_SRC)/text.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(SW_SRC)/lists.h $(game_h) $(SW_SRC)/pal.h $(SW_SRC)/text.h $(SW_SRC)/net.h +$(SW_OBJ)/timer.$o: $(SW_SRC)/timer.cpp $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/sector.h $(SW_SRC)/sprite.h $(SW_SRC)/weapon.h $(AUDIOLIB_INC)/fx_man.h $(AUDIOLIB_INC)/music.h $(SW_SRC)/audiofx.h +$(SW_OBJ)/track.$o: $(SW_SRC)/track.cpp $(build_h) $(names2_h) $(panel_h) $(tags_h) $(SW_SRC)/sector.h $(SW_SRC)/ai.h $(SW_SRC)/player.h $(game_h) $(SW_SRC)/net.h $(SW_SRC)/sprite.h $(SW_SRC)/track.h $(SW_SRC)/weapon.h $(SW_SRC)/saveable.h +$(SW_OBJ)/vator.$o: $(SW_SRC)/vator.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(SW_SRC)/net.h $(tags_h) $(SW_SRC)/sector.h $(SW_SRC)/interp.h $(SW_SRC)/text.h $(SW_SRC)/sprite.h $(SW_SRC)/weapon.h $(SW_SRC)/saveable.h +$(SW_OBJ)/vis.$o: $(SW_SRC)/vis.cpp $(build_h) $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/break.h $(SW_SRC)/quake.h $(SW_SRC)/pal.h $(SW_SRC)/sprite.h +$(SW_OBJ)/wallmove.$o: $(SW_SRC)/wallmove.cpp $(build_h) $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/weapon.h $(SW_SRC)/sprite.h +$(SW_OBJ)/warp.$o: $(SW_SRC)/warp.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(SW_SRC)/warp.h +$(SW_OBJ)/weapon.$o: $(SW_SRC)/weapon.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/break.h $(SW_SRC)/quake.h $(SW_SRC)/net.h $(SW_SRC)/pal.h $(SW_SRC)/vis.h $(SW_SRC)/ai.h $(SW_SRC)/weapon.h $(SW_SRC)/anim.h $(SW_SRC)/damage.h $(SW_SRC)/sector.h $(SW_SRC)/sprite.h $(SW_SRC)/actor.h $(SW_SRC)/track.h $(SW_SRC)/player.h +$(SW_OBJ)/zilla.$o: $(SW_SRC)/zilla.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/quake.h $(SW_SRC)/actor.h $(SW_SRC)/track.h $(AUDIOLIB_INC)/fx_man.h +$(SW_OBJ)/zombie.$o: $(SW_SRC)/zombie.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(SW_SRC)/ai.h $(SW_SRC)/pal.h $(SW_SRC)/player.h $(SW_SRC)/net.h $(SW_SRC)/sprite.h $(SW_SRC)/weapon.h $(SW_SRC)/actor.h $(SW_SRC)/track.h +$(SW_OBJ)/saveable.$o: $(SW_SRC)/saveable.cpp $(ENGINE_INC)/compat.h $(SW_SRC)/saveable.h -$(SW_OBJ)/jnstub.$o: $(SW_SRC)/jnstub.c $(build_h) $(SW_INC)/stag.h $(SW_INC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_INC)/pal.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/editor.h $(ENGINE_INC)/cache1d.h -$(SW_OBJ)/brooms.$o: $(SW_SRC)/brooms.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(game_h) $(ENGINE_INC)/editor.h -$(SW_OBJ)/bldscript.$o: $(SW_SRC)/bldscript.c $(build_h) $(names2_h) $(game_h) $(SW_INC)/parse.h $(ENGINE_INC)/editor.h $(ENGINE_INC)/cache1d.h -$(SW_OBJ)/jbhlp.$o: $(SW_SRC)/jbhlp.c $(build_h) $(SW_INC)/keys.h $(names2_h) $(game_h) $(ENGINE_INC)/editor.h $(ENGINE_INC)/cache1d.h +$(SW_OBJ)/jnstub.$o: $(SW_SRC)/jnstub.cpp $(build_h) $(SW_SRC)/stag.h $(SW_SRC)/keys.h $(names2_h) $(game_h) $(tags_h) $(SW_SRC)/pal.h $(ENGINE_INC)/pragmas.h $(ENGINE_INC)/editor.h $(ENGINE_INC)/cache1d.h +$(SW_OBJ)/brooms.$o: $(SW_SRC)/brooms.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(game_h) $(ENGINE_INC)/editor.h +$(SW_OBJ)/bldscript.$o: $(SW_SRC)/bldscript.cpp $(build_h) $(names2_h) $(game_h) $(SW_SRC)/parse.h $(ENGINE_INC)/editor.h $(ENGINE_INC)/cache1d.h +$(SW_OBJ)/jbhlp.$o: $(SW_SRC)/jbhlp.cpp $(build_h) $(SW_SRC)/keys.h $(names2_h) $(game_h) $(ENGINE_INC)/editor.h $(ENGINE_INC)/cache1d.h $(SW_OBJ)/game_icon.$o: $(SW_RSRC)/game_icon.c -$(SW_OBJ)/grpscan.$o: $(SW_SRC)/grpscan.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/scriptfile.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/crc32.h $(SW_INC)/grpscan.h +$(SW_OBJ)/grpscan.$o: $(SW_SRC)/grpscan.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/scriptfile.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/crc32.h $(SW_SRC)/grpscan.h $(SW_OBJ)/gameres.$o: $(SW_RSRC)/gameres.rc $(SW_SRC)/startwin.game.h $(SW_RSRC)/game.bmp $(SW_RSRC)/game_icon.ico $(SW_OBJ)/buildres.$o: $(SW_RSRC)/buildres.rc $(SW_RSRC)/build.bmp $(SW_RSRC)/game_icon.ico -$(SW_OBJ)/startwin.game.$o: $(SW_SRC)/startwin.game.c $(build_h) $(ENGINE_INC)/winlayer.h $(SW_INC)/grpscan.h -$(SW_OBJ)/startgtk.game.$o: $(SW_SRC)/startgtk.game.c $(build_h) $(ENGINE_INC)/dynamicgtk.h $(ENGINE_INC)/baselayer.h $(SW_INC)/grpscan.h +$(SW_OBJ)/startwin.game.$o: $(SW_SRC)/startwin.game.cpp $(build_h) $(ENGINE_INC)/winlayer.h $(SW_SRC)/grpscan.h +$(SW_OBJ)/startgtk.game.$o: $(SW_SRC)/startgtk.game.cpp $(build_h) $(ENGINE_INC)/dynamicgtk.h $(ENGINE_INC)/baselayer.h $(SW_SRC)/grpscan.h diff --git a/source/sw/rsrc/game_icon.c b/source/sw/rsrc/game_icon.c index 4ddc905b8..4e4cabeef 100644 --- a/source/sw/rsrc/game_icon.c +++ b/source/sw/rsrc/game_icon.c @@ -1,8 +1,8 @@ -#include "compat.h" +#include "sdl_inc.h" #include "sdlappicon.h" -static uint8_t sdlappicon_pixels[] = { +static Uint8 sdlappicon_pixels[] = { "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0l\342\32" "\32w\346Zx\251\343\200\275\321\346\253\316\332\346\327\323\334\347\370\346" diff --git a/source/tools/src/makesdlkeytrans.cpp b/source/tools/src/makesdlkeytrans.cpp index cb68218aa..d09b82a4a 100644 --- a/source/tools/src/makesdlkeytrans.cpp +++ b/source/tools/src/makesdlkeytrans.cpp @@ -4,7 +4,7 @@ #include #include "sdl_inc.h" -#include "sdlkeytrans.c" +#include "sdlkeytrans.cpp" #undef main