teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-18 23:21:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android and MSVC build fixes. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5259 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-05-30 23:31:59 +00:00
parent de28d574ec
commit babb9d9d61
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/Android.mk
View file

@ -66,9 +66,7 @@ BUILD_SRC = \
build/src/scriptfile.c \ build/src/scriptfile.c \
build/src/mutex.c \ build/src/mutex.c \
build/src/xxhash.c \ build/src/xxhash.c \
build/src/mmulti_null.c \
build/src/voxmodel.c \ build/src/voxmodel.c \
build/src/common.c \
build/src/sdlayer.c build/src/sdlayer.c
JMACT_SRC=source/jmact/file_lib.c \ JMACT_SRC=source/jmact/file_lib.c \

9
polymer/eduke32/Makefile.msvc
View file

@ -12,6 +12,11 @@ DUKE3D_OBJ=$(DUKE3D_SRC)\$(obj)
DUKE3D_INC=$(DUKE3D_SRC) DUKE3D_INC=$(DUKE3D_SRC)
DUKE3D_RSRC=rsrc 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_ROOT=$(DUKE3D_SRC)\jaudiolib
AUDIOLIB_OBJ=$(AUDIOLIB_ROOT)\$(obj) AUDIOLIB_OBJ=$(AUDIOLIB_ROOT)\$(obj)
AUDIOLIB_INC=$(AUDIOLIB_ROOT)\include AUDIOLIB_INC=$(AUDIOLIB_ROOT)\include
@ -85,7 +90,7 @@ AS=ml
LINK=link /nologo /opt:ref LINK=link /nologo /opt:ref
MT=mt MT=mt
CFLAGS= /MT /J /nologo $(flags_cl) \ 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) \ /W2 $(ENGINEOPTS) \
/I$(PLATFORM)\include /I$(AUDIOINC)\include /DRENDERTYPE$(RENDERTYPE)=1 /DMIXERTYPE$(MIXERTYPE)=1 /DSDL_FRAMEWORK /DSDL_TARGET=2 /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) $(CHECKDIR_DUKE3D)
$(AS) /c $(ASFLAGS) /Fo$@ $< $(AS) /c $(ASFLAGS) /Fo$@ $<
{$(DUKE3D_SRC)\jmact}.c{$(DUKE3D_OBJ)\}.$o: {$(MACT_ROOT)\}.c{$(DUKE3D_OBJ)\}.$o:
$(CHECKDIR_DUKE3D) $(CHECKDIR_DUKE3D)
$(CC) /c $(CFLAGS) /Fo$@ $< $(CC) /c $(CFLAGS) /Fo$@ $<