Bring the previous commit into effect.

git-svn-id: https://svn.eduke32.com/eduke32@6056 1a8010ca-5511-0410-912e-c29ae57300e0
2024-12-24 02:30:46 +00:00 · 2017-02-01 10:20:54 +00:00 · 2017-02-01 10:20:54 +00:00 · 417b047cf3
commit 417b047cf3
parent 1cc9d13ccf
52 changed files with 2114 additions and 2181 deletions
--- 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
--- 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
--- 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
--- a/314
+++ b/314
@ -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
--- a/platform/Apple/EDuke32.xcodeproj/project.pbxproj
+++ b/platform/Apple/EDuke32.xcodeproj/project.pbxproj
--- 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",
--- 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
--- a/platform/Windows/eduke32.vcxproj
+++ b/platform/Windows/eduke32.vcxproj
@ -53,374 +53,372 @@
    <PlatformToolset>v140</PlatformToolset>
    <OutDir>.\</OutDir>
    <IntDir>.\</IntDir>
-    <NMakeIncludeSearchPath>$(NMakeIncludeSearchPath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;platform\windows\include</NMakeIncludeSearchPath>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f Makefile.msvc DEBUG=1 WINBITS=32</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f Makefile.msvc veryclean all DEBUG=1 WINBITS=32</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f Makefile.msvc veryclean DEBUG=1 WINBITS=32</NMakeCleanCommandLine>
+    <NMakeIncludeSearchPath>$(NMakeIncludeSearchPath);..\..\source\build\include;..\..\source\mact\include;..\..\source\audiolib\include;..\..\source\enet\include;..\..\platform\windows\include</NMakeIncludeSearchPath>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f msvc.mak DEBUG=1 WINBITS=32</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=32</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f msvc.mak veryclean DEBUG=1 WINBITS=32</NMakeCleanCommandLine>
    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">USE_OPENGL;POLYMER</NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f Makefile.msvc WINBITS=32</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f Makefile.msvc veryclean all WINBITS=32</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f Makefile.msvc veryclean WINBITS=32</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f msvc.mak WINBITS=32</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f msvc.mak veryclean all WINBITS=32</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f msvc.mak veryclean WINBITS=32</NMakeCleanCommandLine>
    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">USE_OPENGL;POLYMER</NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f Makefile.msvc DEBUG=1 WINBITS=64</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f Makefile.msvc veryclean all DEBUG=1 WINBITS=64</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f Makefile.msvc veryclean DEBUG=1 WINBITS=64</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f msvc.mak DEBUG=1 WINBITS=64</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=64</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f msvc.mak veryclean DEBUG=1 WINBITS=64</NMakeCleanCommandLine>
    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_OPENGL;POLYMER;NOASM</NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f Makefile.msvc WINBITS=64</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f Makefile.msvc veryclean all WINBITS=64</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f Makefile.msvc veryclean WINBITS=64</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f msvc.mak WINBITS=64</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f msvc.mak veryclean all WINBITS=64</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f msvc.mak veryclean WINBITS=64</NMakeCleanCommandLine>
    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_OPENGL;POLYMER;NOASM</NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|Win32'">nmake /f Makefile.msvc DEBUG=1 WINBITS=32 RENDERTYPE=SDL</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|Win32'">nmake /f Makefile.msvc veryclean all DEBUG=1 WINBITS=32 RENDERTYPE=SDL</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|Win32'">nmake /f Makefile.msvc veryclean DEBUG=1 WINBITS=32 RENDERTYPE=SDL</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|Win32'">nmake /f msvc.mak DEBUG=1 WINBITS=32 RENDERTYPE=SDL</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|Win32'">nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=32 RENDERTYPE=SDL</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|Win32'">nmake /f msvc.mak veryclean DEBUG=1 WINBITS=32 RENDERTYPE=SDL</NMakeCleanCommandLine>
    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|Win32'">USE_OPENGL;POLYMER;SDL_USEFOLDER;SDL_TARGET=2</NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|Win32'">nmake /f Makefile.msvc WINBITS=32 RENDERTYPE=SDL</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|Win32'">nmake /f Makefile.msvc veryclean all WINBITS=32 RENDERTYPE=SDL</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|Win32'">nmake /f Makefile.msvc veryclean WINBITS=32 RENDERTYPE=SDL</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|Win32'">nmake /f msvc.mak WINBITS=32 RENDERTYPE=SDL</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|Win32'">nmake /f msvc.mak veryclean all WINBITS=32 RENDERTYPE=SDL</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|Win32'">nmake /f msvc.mak veryclean WINBITS=32 RENDERTYPE=SDL</NMakeCleanCommandLine>
    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release-SDL|Win32'">USE_OPENGL;POLYMER;SDL_USEFOLDER;SDL_TARGET=2</NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f Makefile.msvc DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f Makefile.msvc veryclean all DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f Makefile.msvc veryclean DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f msvc.mak DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f msvc.mak veryclean DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeCleanCommandLine>
    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">USE_OPENGL;POLYMER;NOASM;HAVE_INTTYPES;SDL_USEFOLDER;SDL_TARGET=2</NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f Makefile.msvc WINBITS=64 RENDERTYPE=SDL</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f Makefile.msvc veryclean all WINBITS=64 RENDERTYPE=SDL</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f Makefile.msvc veryclean WINBITS=64 RENDERTYPE=SDL</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f msvc.mak WINBITS=64 RENDERTYPE=SDL</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f msvc.mak veryclean all WINBITS=64 RENDERTYPE=SDL</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f msvc.mak veryclean WINBITS=64 RENDERTYPE=SDL</NMakeCleanCommandLine>
    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">USE_OPENGL;POLYMER;NOASM;SDL_USEFOLDER;SDL_TARGET=2</NMakePreprocessorDefinitions>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;</IncludePath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\source\build\include;..\..\source\mact\include;..\..\source\audiolib\include;..\..\source\enet\include;</IncludePath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;</IncludePath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\source\build\include;..\..\source\mact\include;..\..\source\audiolib\include;..\..\source\enet\include;</IncludePath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;</IncludePath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\source\build\include;..\..\source\mact\include;..\..\source\audiolib\include;..\..\source\enet\include;</IncludePath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;</IncludePath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\source\build\include;..\..\source\mact\include;..\..\source\audiolib\include;..\..\source\enet\include;</IncludePath>
  </PropertyGroup>
  <ItemGroup>
-    <ClInclude Include="build\include\a.h" />
-    <ClInclude Include="build\include\baselayer.h" />
-    <ClInclude Include="build\include\build.h" />
-    <ClInclude Include="build\include\buildtypes.h" />
-    <ClInclude Include="build\include\cache1d.h" />
-    <ClInclude Include="build\include\clip.h" />
-    <ClInclude Include="build\include\colmatch.h" />
-    <ClInclude Include="build\include\compat.h" />
-    <ClInclude Include="build\include\common.h" />
-    <ClInclude Include="build\include\crc32.h" />
-    <ClInclude Include="build\include\dxdidf.h" />
-    <ClInclude Include="build\include\dxtfilter.h" />
-    <ClInclude Include="build\include\dynamicgtk.h" />
-    <ClInclude Include="build\include\editor.h" />
-    <ClInclude Include="build\include\glbuild.h" />
-    <ClInclude Include="build\include\glext.h" />
-    <ClInclude Include="build\include\gtkbits.h" />
-    <ClInclude Include="build\include\hash.h" />
-    <ClInclude Include="build\include\hightile.h" />
-    <ClInclude Include="build\include\jwzgles.h" />
-    <ClInclude Include="build\include\jwzglesI.h" />
-    <ClInclude Include="build\include\kplib.h" />
-    <ClInclude Include="build\include\libdivide.h" />
-    <ClInclude Include="build\include\lzwnew.h" />
-    <ClInclude Include="build\include\m32script.h" />
-    <ClInclude Include="build\include\md4.h" />
-    <ClInclude Include="build\include\mdsprite.h" />
-    <ClInclude Include="build\include\mmulti.h" />
-    <ClInclude Include="build\include\mutex.h" />
-    <ClInclude Include="build\include\osd.h" />
-    <ClInclude Include="build\include\osxbits.h" />
-    <ClInclude Include="build\include\palette.h" />
-    <ClInclude Include="build\include\polymer.h" />
-    <ClInclude Include="build\include\polymost.h" />
-    <ClInclude Include="build\include\pragmas.h" />
-    <ClInclude Include="build\include\pragmas_arm.h" />
-    <ClInclude Include="build\include\pragmas_ppc.h" />
-    <ClInclude Include="build\include\pragmas_x86_gcc.h" />
-    <ClInclude Include="build\include\pragmas_x86_msvc.h" />
-    <ClInclude Include="build\include\prlights.h" />
-    <ClInclude Include="build\include\lz4.h" />
-    <ClInclude Include="build\include\rawinput.h" />
-    <ClInclude Include="build\include\renderlayer.h" />
-    <ClInclude Include="build\include\scriptfile.h" />
-    <ClInclude Include="build\include\sdlayer.h" />
-    <ClInclude Include="build\include\sdl_inc.h" />
-    <ClInclude Include="build\include\startwin.editor.h" />
-    <ClInclude Include="build\include\texcache.h" />
-    <ClInclude Include="build\include\tracker.hpp" />
-    <ClInclude Include="build\include\tracker_operator.hpp" />
-    <ClInclude Include="build\include\tracker_operators.hpp" />
-    <ClInclude Include="build\include\winbits.h" />
-    <ClInclude Include="build\include\winlayer.h" />
-    <ClInclude Include="build\include\msvc\inttypes.h" />
-    <ClInclude Include="build\include\msvc\stdint.h" />
-    <ClInclude Include="build\include\xxhash.h" />
-    <ClInclude Include="build\src\engine_priv.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\Button.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\ControlSuper.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\GLLines.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\GLRect.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\JNITouchControlsUtils.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\Mouse.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\MultitouchMouse.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\OpenGLUtils.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\PointF.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\RectF.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\TouchControls.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\TouchControlsConfig.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\TouchControlsContainer.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\TouchJoy.h" />
-    <ClInclude Include="platform\Android\Duke3d\jni\TouchControls\WheelSelect.h" />
-    <ClInclude Include="source\actors.h" />
-    <ClInclude Include="source\android.h" />
-    <ClInclude Include="source\android\in_android.h" />
-    <ClInclude Include="source\anim.h" />
-    <ClInclude Include="source\animsounds.h" />
-    <ClInclude Include="source\animvpx.h" />
-    <ClInclude Include="source\cheats.h" />
-    <ClInclude Include="source\cmdline.h" />
-    <ClInclude Include="source\common_game.h" />
-    <ClInclude Include="source\demo.h" />
-    <ClInclude Include="source\events_defs.h" />
-    <ClInclude Include="source\game.h" />
-    <ClInclude Include="source\gameexec.h" />
-    <ClInclude Include="source\gamevars.h" />
-    <ClInclude Include="source\global.h" />
-    <ClInclude Include="source\input.h" />
-    <ClInclude Include="source\inv.h" />
-    <ClInclude Include="source\jaudiolib\include\drivers.h" />
-    <ClInclude Include="source\jaudiolib\include\multivoc.h" />
-    <ClInclude Include="source\lunatic\lunatic_game.h" />
-    <ClInclude Include="source\lunatic\lunatic_m32.h" />
-    <ClInclude Include="source\m32def.h" />
-    <ClInclude Include="source\menus.h" />
-    <ClInclude Include="source\mpu401.h" />
-    <ClInclude Include="source\net.h" />
-    <ClInclude Include="source\player.h" />
-    <ClInclude Include="source\premap.h" />
-    <ClInclude Include="source\quotes.h" />
-    <ClInclude Include="source\savegame.h" />
-    <ClInclude Include="source\sbar.h" />
-    <ClInclude Include="source\screens.h" />
-    <ClInclude Include="source\screentext.h" />
-    <ClInclude Include="source\sector.h" />
-    <ClInclude Include="source\_functio.h" />
-    <ClInclude Include="source\_midi.h" />
-    <ClInclude Include="source\_rts.h" />
-    <ClInclude Include="source\config.h" />
-    <ClInclude Include="source\duke3d.h" />
-    <ClInclude Include="source\function.h" />
-    <ClInclude Include="source\gamedef.h" />
-    <ClInclude Include="source\gamedefs.h" />
-    <ClInclude Include="source\grpscan.h" />
-    <ClInclude Include="source\keys.h" />
-    <ClInclude Include="source\macros.h" />
-    <ClInclude Include="source\mapster32.h" />
-    <ClInclude Include="source\mdump.h" />
-    <ClInclude Include="source\names.h" />
-    <ClInclude Include="source\namesdyn.h" />
-    <ClInclude Include="source\osdcmds.h" />
-    <ClInclude Include="source\osdfuncs.h" />
-    <ClInclude Include="source\rts.h" />
-    <ClInclude Include="source\soundefs.h" />
-    <ClInclude Include="source\sounds.h" />
-    <ClInclude Include="source\sounds_mapster32.h" />
-    <ClInclude Include="source\soundsdyn.h" />
-    <ClInclude Include="source\startwin.game.h" />
-    <ClInclude Include="source\jaudiolib\src\_multivc.h" />
-    <ClInclude Include="source\jaudiolib\src\driver_directsound.h" />
-    <ClInclude Include="source\jaudiolib\src\driver_nosound.h" />
-    <ClInclude Include="source\jaudiolib\src\driver_sdl.h" />
-    <ClInclude Include="source\jaudiolib\include\fx_man.h" />
-    <ClInclude Include="source\jaudiolib\src\linklist.h" />
-    <ClInclude Include="source\jaudiolib\include\music.h" />
-    <ClInclude Include="source\jaudiolib\src\pitch.h" />
-    <ClInclude Include="source\jmact\_control.h" />
-    <ClInclude Include="source\jmact\_scrplib.h" />
-    <ClInclude Include="source\jmact\animlib.h" />
-    <ClInclude Include="source\jmact\control.h" />
-    <ClInclude Include="source\jmact\file_lib.h" />
-    <ClInclude Include="source\jmact\keyboard.h" />
-    <ClInclude Include="source\jmact\mouse.h" />
-    <ClInclude Include="source\jmact\scriplib.h" />
-    <ClInclude Include="source\enet\include\enet\callbacks.h" />
-    <ClInclude Include="source\enet\include\enet\enet.h" />
-    <ClInclude Include="source\enet\include\enet\list.h" />
-    <ClInclude Include="source\enet\include\enet\protocol.h" />
-    <ClInclude Include="source\enet\include\enet\time.h" />
-    <ClInclude Include="source\enet\include\enet\types.h" />
-    <ClInclude Include="source\enet\include\enet\unix.h" />
-    <ClInclude Include="source\enet\include\enet\utility.h" />
-    <ClInclude Include="source\enet\include\enet\win32.h" />
+    <ClInclude Include="..\..\source\build\include\a.h" />
+    <ClInclude Include="..\..\source\build\include\animvpx.h" />
+    <ClInclude Include="..\..\source\build\include\baselayer.h" />
+    <ClInclude Include="..\..\source\build\include\build.h" />
+    <ClInclude Include="..\..\source\build\include\buildtypes.h" />
+    <ClInclude Include="..\..\source\build\include\cache1d.h" />
+    <ClInclude Include="..\..\source\build\include\clip.h" />
+    <ClInclude Include="..\..\source\build\include\colmatch.h" />
+    <ClInclude Include="..\..\source\build\include\compat.h" />
+    <ClInclude Include="..\..\source\build\include\common.h" />
+    <ClInclude Include="..\..\source\build\include\crc32.h" />
+    <ClInclude Include="..\..\source\build\include\dxdidf.h" />
+    <ClInclude Include="..\..\source\build\include\dxtfilter.h" />
+    <ClInclude Include="..\..\source\build\include\dynamicgtk.h" />
+    <ClInclude Include="..\..\source\build\include\editor.h" />
+    <ClInclude Include="..\..\source\build\include\glbuild.h" />
+    <ClInclude Include="..\..\source\build\include\glext.h" />
+    <ClInclude Include="..\..\source\build\include\gtkbits.h" />
+    <ClInclude Include="..\..\source\build\include\hash.h" />
+    <ClInclude Include="..\..\source\build\include\hightile.h" />
+    <ClInclude Include="..\..\source\build\include\jwzgles.h" />
+    <ClInclude Include="..\..\source\build\include\jwzglesI.h" />
+    <ClInclude Include="..\..\source\build\include\kplib.h" />
+    <ClInclude Include="..\..\source\build\include\libdivide.h" />
+    <ClInclude Include="..\..\source\build\include\lzwnew.h" />
+    <ClInclude Include="..\..\source\build\include\m32script.h" />
+    <ClInclude Include="..\..\source\build\include\md4.h" />
+    <ClInclude Include="..\..\source\build\include\mdsprite.h" />
+    <ClInclude Include="..\..\source\build\include\mmulti.h" />
+    <ClInclude Include="..\..\source\build\include\mutex.h" />
+    <ClInclude Include="..\..\source\build\include\osd.h" />
+    <ClInclude Include="..\..\source\build\include\osxbits.h" />
+    <ClInclude Include="..\..\source\build\include\palette.h" />
+    <ClInclude Include="..\..\source\build\include\polymer.h" />
+    <ClInclude Include="..\..\source\build\include\polymost.h" />
+    <ClInclude Include="..\..\source\build\include\pragmas.h" />
+    <ClInclude Include="..\..\source\build\include\pragmas_arm.h" />
+    <ClInclude Include="..\..\source\build\include\pragmas_ppc.h" />
+    <ClInclude Include="..\..\source\build\include\pragmas_x86_gcc.h" />
+    <ClInclude Include="..\..\source\build\include\pragmas_x86_msvc.h" />
+    <ClInclude Include="..\..\source\build\include\prlights.h" />
+    <ClInclude Include="..\..\source\build\include\lz4.h" />
+    <ClInclude Include="..\..\source\build\include\rawinput.h" />
+    <ClInclude Include="..\..\source\build\include\renderlayer.h" />
+    <ClInclude Include="..\..\source\build\include\scriptfile.h" />
+    <ClInclude Include="..\..\source\build\include\sdlayer.h" />
+    <ClInclude Include="..\..\source\build\include\sdl_inc.h" />
+    <ClInclude Include="..\..\source\build\include\startwin.editor.h" />
+    <ClInclude Include="..\..\source\build\include\texcache.h" />
+    <ClInclude Include="..\..\source\build\include\tracker.hpp" />
+    <ClInclude Include="..\..\source\build\include\tracker_operator.hpp" />
+    <ClInclude Include="..\..\source\build\include\tracker_operators.hpp" />
+    <ClInclude Include="..\..\source\build\include\winbits.h" />
+    <ClInclude Include="..\..\source\build\include\winlayer.h" />
+    <ClInclude Include="..\..\source\build\include\msvc\inttypes.h" />
+    <ClInclude Include="..\..\source\build\include\msvc\stdint.h" />
+    <ClInclude Include="..\..\source\build\include\xxhash.h" />
+    <ClInclude Include="..\..\source\build\src\engine_priv.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\Button.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\ControlSuper.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\GLLines.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\GLRect.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\JNITouchControlsUtils.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\Mouse.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\MultitouchMouse.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\OpenGLUtils.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\PointF.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\RectF.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\TouchControls.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\TouchControlsConfig.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\TouchControlsContainer.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\TouchJoy.h" />
+    <ClInclude Include="..\..\platform\Android\Duke3d\jni\TouchControls\WheelSelect.h" />
+    <ClInclude Include="..\..\source\duke3d\src\actors.h" />
+    <ClInclude Include="..\..\source\duke3d\src\android.h" />
+    <ClInclude Include="..\..\source\duke3d\src\in_android.h" />
+    <ClInclude Include="..\..\source\duke3d\src\anim.h" />
+    <ClInclude Include="..\..\source\duke3d\src\animsounds.h" />
+    <ClInclude Include="..\..\source\duke3d\src\cheats.h" />
+    <ClInclude Include="..\..\source\duke3d\src\cmdline.h" />
+    <ClInclude Include="..\..\source\duke3d\src\common_game.h" />
+    <ClInclude Include="..\..\source\duke3d\src\demo.h" />
+    <ClInclude Include="..\..\source\duke3d\src\events_defs.h" />
+    <ClInclude Include="..\..\source\duke3d\src\game.h" />
+    <ClInclude Include="..\..\source\duke3d\src\gameexec.h" />
+    <ClInclude Include="..\..\source\duke3d\src\gamevars.h" />
+    <ClInclude Include="..\..\source\duke3d\src\global.h" />
+    <ClInclude Include="..\..\source\duke3d\src\input.h" />
+    <ClInclude Include="..\..\source\duke3d\src\inv.h" />
+    <ClInclude Include="..\..\source\audiolib\include\drivers.h" />
+    <ClInclude Include="..\..\source\audiolib\include\multivoc.h" />
+    <ClInclude Include="..\..\source\duke3d\src\lunatic\lunatic_game.h" />
+    <ClInclude Include="..\..\source\duke3d\src\lunatic\lunatic_editor.h" />
+    <ClInclude Include="..\..\source\duke3d\src\m32def.h" />
+    <ClInclude Include="..\..\source\duke3d\src\menus.h" />
+    <ClInclude Include="..\..\source\duke3d\src\mpu401.h" />
+    <ClInclude Include="..\..\source\duke3d\src\net.h" />
+    <ClInclude Include="..\..\source\duke3d\src\player.h" />
+    <ClInclude Include="..\..\source\duke3d\src\premap.h" />
+    <ClInclude Include="..\..\source\duke3d\src\quotes.h" />
+    <ClInclude Include="..\..\source\duke3d\src\savegame.h" />
+    <ClInclude Include="..\..\source\duke3d\src\sbar.h" />
+    <ClInclude Include="..\..\source\duke3d\src\screens.h" />
+    <ClInclude Include="..\..\source\duke3d\src\screentext.h" />
+    <ClInclude Include="..\..\source\duke3d\src\sector.h" />
+    <ClInclude Include="..\..\source\duke3d\src\_functio.h" />
+    <ClInclude Include="..\..\source\duke3d\src\_midi.h" />
+    <ClInclude Include="..\..\source\duke3d\src\_rts.h" />
+    <ClInclude Include="..\..\source\duke3d\src\config.h" />
+    <ClInclude Include="..\..\source\duke3d\src\duke3d.h" />
+    <ClInclude Include="..\..\source\duke3d\src\function.h" />
+    <ClInclude Include="..\..\source\duke3d\src\gamedef.h" />
+    <ClInclude Include="..\..\source\duke3d\src\gamedefs.h" />
+    <ClInclude Include="..\..\source\duke3d\src\grpscan.h" />
+    <ClInclude Include="..\..\source\duke3d\src\keys.h" />
+    <ClInclude Include="..\..\source\duke3d\src\macros.h" />
+    <ClInclude Include="..\..\source\duke3d\src\mapster32.h" />
+    <ClInclude Include="..\..\source\duke3d\src\mdump.h" />
+    <ClInclude Include="..\..\source\duke3d\src\names.h" />
+    <ClInclude Include="..\..\source\duke3d\src\namesdyn.h" />
+    <ClInclude Include="..\..\source\duke3d\src\osdcmds.h" />
+    <ClInclude Include="..\..\source\duke3d\src\osdfuncs.h" />
+    <ClInclude Include="..\..\source\duke3d\src\rts.h" />
+    <ClInclude Include="..\..\source\duke3d\src\soundefs.h" />
+    <ClInclude Include="..\..\source\duke3d\src\sounds.h" />
+    <ClInclude Include="..\..\source\duke3d\src\sounds_mapster32.h" />
+    <ClInclude Include="..\..\source\duke3d\src\soundsdyn.h" />
+    <ClInclude Include="..\..\source\duke3d\src\startwin.game.h" />
+    <ClInclude Include="..\..\source\audiolib\src\_multivc.h" />
+    <ClInclude Include="..\..\source\audiolib\src\driver_directsound.h" />
+    <ClInclude Include="..\..\source\audiolib\src\driver_nosound.h" />
+    <ClInclude Include="..\..\source\audiolib\src\driver_sdl.h" />
+    <ClInclude Include="..\..\source\audiolib\include\fx_man.h" />
+    <ClInclude Include="..\..\source\audiolib\src\linklist.h" />
+    <ClInclude Include="..\..\source\audiolib\include\music.h" />
+    <ClInclude Include="..\..\source\audiolib\src\pitch.h" />
+    <ClInclude Include="..\..\source\mact\include\_control.h" />
+    <ClInclude Include="..\..\source\mact\src\_scrplib.h" />
+    <ClInclude Include="..\..\source\mact\include\animlib.h" />
+    <ClInclude Include="..\..\source\mact\include\control.h" />
+    <ClInclude Include="..\..\source\mact\include\file_lib.h" />
+    <ClInclude Include="..\..\source\mact\include\keyboard.h" />
+    <ClInclude Include="..\..\source\mact\include\mouse.h" />
+    <ClInclude Include="..\..\source\mact\include\scriplib.h" />
+    <ClInclude Include="..\..\source\enet\include\enet\callbacks.h" />
+    <ClInclude Include="..\..\source\enet\include\enet\enet.h" />
+    <ClInclude Include="..\..\source\enet\include\enet\list.h" />
+    <ClInclude Include="..\..\source\enet\include\enet\protocol.h" />
+    <ClInclude Include="..\..\source\enet\include\enet\time.h" />
+    <ClInclude Include="..\..\source\enet\include\enet\types.h" />
+    <ClInclude Include="..\..\source\enet\include\enet\unix.h" />
+    <ClInclude Include="..\..\source\enet\include\enet\utility.h" />
+    <ClInclude Include="..\..\source\enet\include\enet\win32.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="build\src\2d.c" />
-    <ClCompile Include="build\src\a-c.c" />
-    <ClCompile Include="build\src\baselayer.c" />
-    <ClCompile Include="build\src\build.c" />
-    <ClCompile Include="build\src\cache1d.c" />
-    <ClCompile Include="build\src\clip.c" />
-    <ClCompile Include="build\src\colmatch.c" />
-    <ClCompile Include="build\src\common.c" />
-    <ClCompile Include="build\src\compat.c" />
-    <ClCompile Include="build\src\config.c" />
-    <ClCompile Include="build\src\crc32.c" />
-    <ClCompile Include="build\src\defs.c" />
-    <ClCompile Include="build\src\dxtfilter.c" />
-    <ClCompile Include="build\src\dynamicgtk.c" />
-    <ClCompile Include="build\src\engine.c" />
-    <ClCompile Include="build\src\glbuild.c" />
-    <ClCompile Include="build\src\gtkbits.c" />
-    <ClCompile Include="build\src\hash.c" />
-    <ClCompile Include="build\src\hightile.c" />
-    <ClCompile Include="build\src\jwzgles.c" />
-    <ClCompile Include="build\src\kplib.c" />
-    <ClCompile Include="build\src\lzwnew.c" />
-    <ClCompile Include="build\src\md4.c" />
-    <ClCompile Include="build\src\mdsprite.c" />
-    <ClCompile Include="build\src\mhk.c" />
-    <ClCompile Include="build\src\mutex.c" />
-    <ClCompile Include="build\src\osd.c" />
-    <ClCompile Include="build\src\palette.c" />
-    <ClCompile Include="build\src\polymer.c" />
-    <ClCompile Include="build\src\polymost.c" />
-    <ClCompile Include="build\src\pragmas.c" />
-    <ClCompile Include="build\src\lz4.c" />
-    <ClCompile Include="build\src\rawinput.c" />
-    <ClCompile Include="build\src\screenshot.c" />
-    <ClCompile Include="build\src\scriptfile.c" />
-    <ClCompile Include="build\src\sdlayer.c" />
-    <ClCompile Include="build\src\sdlayer12.c" />
-    <ClCompile Include="build\src\smalltextfont.c" />
-    <ClCompile Include="build\src\startgtk.editor.c" />
-    <ClCompile Include="build\src\startwin.editor.c" />
-    <ClCompile Include="build\src\texcache.c" />
-    <ClCompile Include="build\src\textfont.c" />
-    <ClCompile Include="build\src\tiles.c" />
-    <ClCompile Include="build\src\voxmodel.c" />
-    <ClCompile Include="build\src\winbits.c" />
-    <ClCompile Include="build\src\winlayer.c" />
-    <ClCompile Include="build\src\xxhash.c" />
-    <ClCompile Include="platform\Android\Duke3d\jni\TouchControls\Button.cpp" />
-    <ClCompile Include="platform\Android\Duke3d\jni\TouchControls\ControlSuper.cpp" />
-    <ClCompile Include="platform\Android\Duke3d\jni\TouchControls\GLLines.cpp" />
-    <ClCompile Include="platform\Android\Duke3d\jni\TouchControls\GLRect.cpp" />
-    <ClCompile Include="platform\Android\Duke3d\jni\TouchControls\JNITouchControlsUtils.cpp" />
-    <ClCompile Include="platform\Android\Duke3d\jni\TouchControls\Mouse.cpp" />
-    <ClCompile Include="platform\Android\Duke3d\jni\TouchControls\MultitouchMouse.cpp" />
-    <ClCompile Include="platform\Android\Duke3d\jni\TouchControls\OpenGLUtils.cpp" />
-    <ClCompile Include="platform\Android\Duke3d\jni\TouchControls\RectF.cpp" />
-    <ClCompile Include="platform\Android\Duke3d\jni\TouchControls\TouchControls.cpp" />
-    <ClCompile Include="platform\Android\Duke3d\jni\TouchControls\TouchControlsContainer.cpp" />
-    <ClCompile Include="platform\Android\Duke3d\jni\TouchControls\TouchJoy.cpp" />
-    <ClCompile Include="platform\Android\Duke3d\jni\TouchControls\WheelSelect.cpp" />
-    <ClCompile Include="source\actors.c" />
-    <ClCompile Include="source\android\android-jni.cpp" />
-    <ClCompile Include="source\android\in_android.c" />
-    <ClCompile Include="source\anim.c" />
-    <ClCompile Include="source\animsounds.c" />
-    <ClCompile Include="source\animvpx.c" />
-    <ClCompile Include="source\astub.c" />
-    <ClCompile Include="source\cheats.c" />
-    <ClCompile Include="source\cmdline.c" />
-    <ClCompile Include="source\config.c" />
-    <ClCompile Include="source\common.c" />
-    <ClCompile Include="source\demo.c" />
-    <ClCompile Include="source\enet\src\compress.c" />
-    <ClCompile Include="source\game.c" />
-    <ClCompile Include="source\gamedef.c" />
-    <ClCompile Include="source\gameexec.c" />
-    <ClCompile Include="source\gamestructures.c" />
-    <ClCompile Include="source\gamevars.c" />
-    <ClCompile Include="source\global.c" />
-    <ClCompile Include="source\grpscan.c" />
-    <ClCompile Include="source\input.c" />
-    <ClCompile Include="source\jaudiolib\src\flac.c" />
-    <ClCompile Include="source\jaudiolib\src\formats.c" />
-    <ClCompile Include="source\jaudiolib\src\xa.c" />
-    <ClCompile Include="source\lunatic\lunatic_game.c" />
-    <ClCompile Include="source\lunatic\lunatic_m32.c" />
-    <ClCompile Include="source\m32common.c" />
-    <ClCompile Include="source\m32def.c" />
-    <ClCompile Include="source\m32exec.c" />
-    <ClCompile Include="source\m32structures.c" />
-    <ClCompile Include="source\m32vars.c" />
-    <ClCompile Include="source\mdump.cpp" />
-    <ClCompile Include="source\menus.c" />
-    <ClCompile Include="source\midi.c" />
-    <ClCompile Include="source\mpu401.c" />
-    <ClCompile Include="source\music.c" />
-    <ClCompile Include="source\namesdyn.c" />
-    <ClCompile Include="source\net.c" />
-    <ClCompile Include="source\osdcmds.c" />
-    <ClCompile Include="source\osdfuncs.c" />
-    <ClCompile Include="source\player.c" />
-    <ClCompile Include="source\premap.c" />
-    <ClCompile Include="source\rts.c" />
-    <ClCompile Include="source\savegame.c" />
-    <ClCompile Include="source\sbar.c" />
-    <ClCompile Include="source\screens.c" />
-    <ClCompile Include="source\screentext.c" />
-    <ClCompile Include="source\sdlmusic.c" />
-    <ClCompile Include="source\sector.c" />
-    <ClCompile Include="source\sounds.c" />
-    <ClCompile Include="source\sounds_mapster32.c" />
-    <ClCompile Include="source\soundsdyn.c" />
-    <ClCompile Include="source\startgtk.game.c" />
-    <ClCompile Include="source\startwin.game.c" />
-    <ClCompile Include="source\winbits.c" />
-    <ClCompile Include="source\jaudiolib\src\driver_directsound.c" />
-    <ClCompile Include="source\jaudiolib\src\driver_nosound.c" />
-    <ClCompile Include="source\jaudiolib\src\driver_sdl.c" />
-    <ClCompile Include="source\jaudiolib\src\drivers.c" />
-    <ClCompile Include="source\jaudiolib\src\fx_man.c" />
-    <ClCompile Include="source\jaudiolib\src\mix.c" />
-    <ClCompile Include="source\jaudiolib\src\mixst.c" />
-    <ClCompile Include="source\jaudiolib\src\multivoc.c" />
-    <ClCompile Include="source\jaudiolib\src\pitch.c" />
-    <ClCompile Include="source\jaudiolib\src\vorbis.c" />
-    <ClCompile Include="source\jmact\animlib.c" />
-    <ClCompile Include="source\jmact\control.c" />
-    <ClCompile Include="source\jmact\file_lib.c" />
-    <ClCompile Include="source\jmact\keyboard.c" />
-    <ClCompile Include="source\jmact\scriplib.c" />
-    <ClCompile Include="source\enet\src\callbacks.c" />
-    <ClCompile Include="source\enet\src\host.c" />
-    <ClCompile Include="source\enet\src\list.c" />
-    <ClCompile Include="source\enet\src\packet.c" />
-    <ClCompile Include="source\enet\src\peer.c" />
-    <ClCompile Include="source\enet\src\protocol.c" />
-    <ClCompile Include="source\enet\src\unix.c" />
-    <ClCompile Include="source\enet\src\win32.c" />
+    <ClCompile Include="..\..\source\build\src\2d.cpp" />
+    <ClCompile Include="..\..\source\build\src\a-c.cpp" />
+    <ClCompile Include="..\..\source\build\src\animvpx.cpp" />
+    <ClCompile Include="..\..\source\build\src\baselayer.cpp" />
+    <ClCompile Include="..\..\source\build\src\build.cpp" />
+    <ClCompile Include="..\..\source\build\src\cache1d.cpp" />
+    <ClCompile Include="..\..\source\build\src\clip.cpp" />
+    <ClCompile Include="..\..\source\build\src\colmatch.cpp" />
+    <ClCompile Include="..\..\source\build\src\common.cpp" />
+    <ClCompile Include="..\..\source\build\src\compat.cpp" />
+    <ClCompile Include="..\..\source\build\src\config.cpp" />
+    <ClCompile Include="..\..\source\build\src\crc32.cpp" />
+    <ClCompile Include="..\..\source\build\src\defs.cpp" />
+    <ClCompile Include="..\..\source\build\src\dxtfilter.cpp" />
+    <ClCompile Include="..\..\source\build\src\dynamicgtk.cpp" />
+    <ClCompile Include="..\..\source\build\src\engine.cpp" />
+    <ClCompile Include="..\..\source\build\src\glbuild.cpp" />
+    <ClCompile Include="..\..\source\build\src\gtkbits.cpp" />
+    <ClCompile Include="..\..\source\build\src\hash.cpp" />
+    <ClCompile Include="..\..\source\build\src\hightile.cpp" />
+    <ClCompile Include="..\..\source\build\src\jwzgles.c" />
+    <ClCompile Include="..\..\source\build\src\kplib.cpp" />
+    <ClCompile Include="..\..\source\build\src\lzwnew.cpp" />
+    <ClCompile Include="..\..\source\build\src\md4.cpp" />
+    <ClCompile Include="..\..\source\build\src\mdsprite.cpp" />
+    <ClCompile Include="..\..\source\build\src\mhk.cpp" />
+    <ClCompile Include="..\..\source\build\src\mutex.cpp" />
+    <ClCompile Include="..\..\source\build\src\osd.cpp" />
+    <ClCompile Include="..\..\source\build\src\palette.cpp" />
+    <ClCompile Include="..\..\source\build\src\polymer.cpp" />
+    <ClCompile Include="..\..\source\build\src\polymost.cpp" />
+    <ClCompile Include="..\..\source\build\src\pragmas.cpp" />
+    <ClCompile Include="..\..\source\build\src\lz4.c" />
+    <ClCompile Include="..\..\source\build\src\rawinput.cpp" />
+    <ClCompile Include="..\..\source\build\src\screenshot.cpp" />
+    <ClCompile Include="..\..\source\build\src\scriptfile.cpp" />
+    <ClCompile Include="..\..\source\build\src\sdlayer.cpp" />
+    <ClCompile Include="..\..\source\build\src\sdlayer12.cpp" />
+    <ClCompile Include="..\..\source\build\src\smalltextfont.cpp" />
+    <ClCompile Include="..\..\source\build\src\startgtk.editor.cpp" />
+    <ClCompile Include="..\..\source\build\src\startwin.editor.cpp" />
+    <ClCompile Include="..\..\source\build\src\texcache.cpp" />
+    <ClCompile Include="..\..\source\build\src\textfont.cpp" />
+    <ClCompile Include="..\..\source\build\src\tiles.cpp" />
+    <ClCompile Include="..\..\source\build\src\voxmodel.cpp" />
+    <ClCompile Include="..\..\source\build\src\winbits.cpp" />
+    <ClCompile Include="..\..\source\build\src\winlayer.cpp" />
+    <ClCompile Include="..\..\source\build\src\xxhash.c" />
+    <ClCompile Include="..\..\platform\Android\Duke3d\jni\TouchControls\Button.cpp" />
+    <ClCompile Include="..\..\platform\Android\Duke3d\jni\TouchControls\ControlSuper.cpp" />
+    <ClCompile Include="..\..\platform\Android\Duke3d\jni\TouchControls\GLLines.cpp" />
+    <ClCompile Include="..\..\platform\Android\Duke3d\jni\TouchControls\GLRect.cpp" />
+    <ClCompile Include="..\..\platform\Android\Duke3d\jni\TouchControls\JNITouchControlsUtils.cpp" />
+    <ClCompile Include="..\..\platform\Android\Duke3d\jni\TouchControls\Mouse.cpp" />
+    <ClCompile Include="..\..\platform\Android\Duke3d\jni\TouchControls\MultitouchMouse.cpp" />
+    <ClCompile Include="..\..\platform\Android\Duke3d\jni\TouchControls\OpenGLUtils.cpp" />
+    <ClCompile Include="..\..\platform\Android\Duke3d\jni\TouchControls\RectF.cpp" />
+    <ClCompile Include="..\..\platform\Android\Duke3d\jni\TouchControls\TouchControls.cpp" />
+    <ClCompile Include="..\..\platform\Android\Duke3d\jni\TouchControls\TouchControlsContainer.cpp" />
+    <ClCompile Include="..\..\platform\Android\Duke3d\jni\TouchControls\TouchJoy.cpp" />
+    <ClCompile Include="..\..\platform\Android\Duke3d\jni\TouchControls\WheelSelect.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\actors.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\in_android.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\anim.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\animsounds.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\astub.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\cheats.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\cmdline.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\config.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\common.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\demo.cpp" />
+    <ClCompile Include="..\..\source\enet\src\compress.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\game.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\gamedef.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\gameexec.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\gamestructures.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\gamevars.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\global.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\grpscan.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\input.cpp" />
+    <ClCompile Include="..\..\source\audiolib\src\flac.cpp" />
+    <ClCompile Include="..\..\source\audiolib\src\formats.cpp" />
+    <ClCompile Include="..\..\source\audiolib\src\xa.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\lunatic\lunatic_game.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\lunatic\lunatic_editor.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\m32common.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\m32def.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\m32exec.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\m32structures.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\m32vars.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\mdump.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\menus.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\midi.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\mpu401.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\music.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\namesdyn.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\net.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\osdcmds.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\osdfuncs.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\player.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\premap.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\rts.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\savegame.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\sbar.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\screens.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\screentext.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\sdlmusic.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\sector.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\sounds.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\sounds_mapster32.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\soundsdyn.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\startgtk.game.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\startwin.game.cpp" />
+    <ClCompile Include="..\..\source\duke3d\src\winbits.cpp" />
+    <ClCompile Include="..\..\source\audiolib\src\driver_directsound.cpp" />
+    <ClCompile Include="..\..\source\audiolib\src\driver_nosound.cpp" />
+    <ClCompile Include="..\..\source\audiolib\src\driver_sdl.cpp" />
+    <ClCompile Include="..\..\source\audiolib\src\drivers.cpp" />
+    <ClCompile Include="..\..\source\audiolib\src\fx_man.cpp" />
+    <ClCompile Include="..\..\source\audiolib\src\mix.cpp" />
+    <ClCompile Include="..\..\source\audiolib\src\mixst.cpp" />
+    <ClCompile Include="..\..\source\audiolib\src\multivoc.cpp" />
+    <ClCompile Include="..\..\source\audiolib\src\pitch.cpp" />
+    <ClCompile Include="..\..\source\audiolib\src\vorbis.cpp" />
+    <ClCompile Include="..\..\source\mact\src\animlib.cpp" />
+    <ClCompile Include="..\..\source\mact\src\control.cpp" />
+    <ClCompile Include="..\..\source\mact\src\file_lib.cpp" />
+    <ClCompile Include="..\..\source\mact\src\keyboard.cpp" />
+    <ClCompile Include="..\..\source\mact\src\scriplib.cpp" />
+    <ClCompile Include="..\..\source\enet\src\callbacks.c" />
+    <ClCompile Include="..\..\source\enet\src\host.c" />
+    <ClCompile Include="..\..\source\enet\src\list.c" />
+    <ClCompile Include="..\..\source\enet\src\packet.c" />
+    <ClCompile Include="..\..\source\enet\src\peer.c" />
+    <ClCompile Include="..\..\source\enet\src\protocol.c" />
+    <ClCompile Include="..\..\source\enet\src\unix.c" />
+    <ClCompile Include="..\..\source\enet\src\win32.c" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="build\Makefile.msvc" />
-    <None Include="Makefile.msvc" />
-    <None Include="source\lunatic\bcarray.lua" />
-    <None Include="source\lunatic\bcheck.lua" />
-    <None Include="source\lunatic\bitar.lua" />
-    <None Include="source\lunatic\control.lua" />
-    <None Include="source\lunatic\con_lang.lua" />
-    <None Include="source\lunatic\defs.ilua" />
-    <None Include="source\lunatic\defs_common.lua" />
-    <None Include="source\lunatic\defs_m32.ilua" />
-    <None Include="source\lunatic\dis_x64.lua" />
-    <None Include="source\lunatic\dis_x86.lua" />
-    <None Include="source\lunatic\dump.lua" />
-    <None Include="source\lunatic\dynsymlist" />
-    <None Include="source\lunatic\dynsymlist_m32" />
-    <None Include="source\lunatic\engine_maptext.lua" />
-    <None Include="source\lunatic\listglobals.sh" />
-    <None Include="source\lunatic\lunacon.lua" />
-    <None Include="source\lunatic\profdemo.lua" />
-    <None Include="source\lunatic\randgen.lua" />
-    <None Include="source\lunatic\savegame.lua" />
-    <None Include="source\lunatic\stat.lua" />
-    <None Include="source\lunatic\strict.lua" />
-    <None Include="source\lunatic\test.lua" />
-    <None Include="source\lunatic\v.lua" />
-    <None Include="source\lunatic\xmath.lua" />
+    <None Include="msvc.mak" />
+    <None Include="..\..\source\duke3d\src\lunatic\bcarray.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\bcheck.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\bitar.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\control.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\con_lang.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\_defs_game.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\defs_common.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\_defs_editor.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\dis_x64.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\dis_x86.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\dump.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\dynsymlist_game.lds" />
+    <None Include="..\..\source\duke3d\src\lunatic\dynsymlist_editor.lds" />
+    <None Include="..\..\source\duke3d\src\lunatic\engine_maptext.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\listglobals.sh" />
+    <None Include="..\..\source\duke3d\src\lunatic\lunacon.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\profdemo.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\randgen.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\savegame.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\stat.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\strict.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\test.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\v.lua" />
+    <None Include="..\..\source\duke3d\src\lunatic\xmath.lua" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/platform/Windows/eduke32.vcxproj.filters
+++ b/platform/Windows/eduke32.vcxproj.filters
--- 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

--- 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 ()
--- 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
--- 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)
 {
--- 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__ */
--- 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;
 };
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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;

--- 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);
--- 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();
--- 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];
--- 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)

--- 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)                                                                                            \
--- 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.
--- 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"

--- 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];
--- 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
--- 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
--- 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;
--- 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;
--- 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)

--- a/source/duke3d/src/lunatic/lunatic_editor.cpp
+++ b/source/duke3d/src/lunatic/lunatic_editor.cpp
@ -6,7 +6,7 @@
 # include <luajit-2.0/lualib.h>
 #endif

-#include "lunatic_m32.h"
+#include "lunatic_editor.h"


 int Em_CreateState(L_State *estate)
--- 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 <stdint.h>
 #include <stdlib.h>  // getenv
 #include <errno.h>
--- 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

--- 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
--- 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)
--- 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)
 {
--- 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 <sys/stat.h>

-#include "android/in_android.h"
+#include "in_android.h"
 #ifndef __ANDROID__
 droidinput_t droidinput;
 #endif
--- 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;
--- 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
    {
--- 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 <stdint.h>
+#else
+# include <cstdint>
+#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
 }
--- 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"
--- 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"
--- 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"
--- 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"
--- 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)

--- 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
--- 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"
--- a/source/tools/src/makesdlkeytrans.cpp
+++ b/source/tools/src/makesdlkeytrans.cpp
@ -4,7 +4,7 @@
 #include <string.h>
 #include "sdl_inc.h"

-#include "sdlkeytrans.c"
+#include "sdlkeytrans.cpp"

 #undef main