zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lunatic: fix build on OS X, pass LUNATIC define to build/ sources. 

git-svn-id: https://svn.eduke32.com/eduke32@2860 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-08-02 10:52:38 +00:00
parent 86a3603edd
commit b7cfd2fe2c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
polymer/eduke32/Makefile
View File

@ -411,7 +411,13 @@ $(OBJ)/%.$o: $(SRC)/%.c
# Create object files directly with luajit
$(OBJ)/luaJIT_BC_%.$o: $(SRC)/lunatic/%.lua
$(COMPILE_STATUS)
ifeq ($(PLATFORM),DARWIN)
# LuaJIT on OS X doesn't support writing Mach-O objects as of beta-10,
# so we pipe the C source into GCC.
if $(LUAJIT) -bg -t c $< - | $(CC) -xc -c - -o $@; then $(COMPILE_OK); else $(COMPILE_FAILED); fi
else
if $(LUAJIT) -bg $< $@; then $(COMPILE_OK); else $(COMPILE_FAILED); fi
endif
$(OBJ)/%.$o: $(SRC)/lunatic/%.c
$(COMPILE_STATUS)

2
polymer/eduke32/build/Makefile
View File

@ -55,7 +55,7 @@ OURASFLAGS=$(BASEASFLAGS)
OURLDFLAGS=$(BASELDFLAGS) $(BUILDLDFLAGS)
ifneq ($(LUNATIC),0)
OURCFLAGS+= -DLUNATIC_ENABLE
OURCFLAGS+= -DLUNATIC
endif
UTILLIBS= -lm # -lpthread