From babb9d9d61ce8bc7187a35ac57f1e09438ef5f1a Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 30 May 2015 23:31:59 +0000
Subject: [PATCH] Android and MSVC build fixes. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@5259 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/Android.mk    | 2 --
 polymer/eduke32/Makefile.msvc | 9 +++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/polymer/eduke32/Android.mk b/polymer/eduke32/Android.mk
index 435d162c0..cf6ff0d67 100644
--- a/polymer/eduke32/Android.mk
+++ b/polymer/eduke32/Android.mk
@@ -66,9 +66,7 @@ BUILD_SRC = \
 	build/src/scriptfile.c \
 	build/src/mutex.c \
         build/src/xxhash.c \
-        build/src/mmulti_null.c \
         build/src/voxmodel.c \
-        build/src/common.c \
         build/src/sdlayer.c
 
 JMACT_SRC=source/jmact/file_lib.c \
diff --git a/polymer/eduke32/Makefile.msvc b/polymer/eduke32/Makefile.msvc
index 9d2c59934..f7d10bea3 100644
--- a/polymer/eduke32/Makefile.msvc
+++ b/polymer/eduke32/Makefile.msvc
@@ -12,6 +12,11 @@ DUKE3D_OBJ=$(DUKE3D_SRC)\$(obj)
 DUKE3D_INC=$(DUKE3D_SRC)
 DUKE3D_RSRC=rsrc
 
+MACT_ROOT=$(DUKE3D_SRC)\jmact
+MACT_SRC=$(MACT_ROOT)
+MACT_INC=$(MACT_ROOT)
+MACT_OBJ=$(MACT_ROOT)\$(obj)
+
 AUDIOLIB_ROOT=$(DUKE3D_SRC)\jaudiolib
 AUDIOLIB_OBJ=$(AUDIOLIB_ROOT)\$(obj)
 AUDIOLIB_INC=$(AUDIOLIB_ROOT)\include
@@ -85,7 +90,7 @@ 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$(DUKE3D_SRC)\jmact /I$(AUDIOLIB_ROOT)\include /I$(ENET_ROOT)\include \
+	/I$(DUKE3D_INC) /I$(ENGINE_INC)\msvc /I$(ENGINE_INC) /I$(MACT_ROOT) /I$(AUDIOLIB_ROOT)\include /I$(ENET_ROOT)\include \
  	/W2 $(ENGINEOPTS) \
  	/I$(PLATFORM)\include /I$(AUDIOINC)\include /DRENDERTYPE$(RENDERTYPE)=1 /DMIXERTYPE$(MIXERTYPE)=1 /DSDL_FRAMEWORK /DSDL_TARGET=2 
 
@@ -310,7 +315,7 @@ CHECKDIR_AUDIOLIB=@if not exist "$(AUDIOLIB_OBJ)" mkdir "$(AUDIOLIB_OBJ)"
 	$(CHECKDIR_DUKE3D)
 	$(AS) /c $(ASFLAGS) /Fo$@ $<
 
-{$(DUKE3D_SRC)\jmact}.c{$(DUKE3D_OBJ)\}.$o:
+{$(MACT_ROOT)\}.c{$(DUKE3D_OBJ)\}.$o:
 	$(CHECKDIR_DUKE3D)
 	$(CC) /c $(CFLAGS) /Fo$@ $<