zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid hardcoded tool names to allow cross-compiling.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1503 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2009-09-29 23:27:48 +00:00
parent 577e3bd124
commit f8f554206f
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
polymer/eduke32/Makefile
View file

@ -55,6 +55,8 @@ JAUDIOLIB=libjfaudiolib.a
CC=gcc CC=gcc
CXX=g++ CXX=g++
AS=nasm AS=nasm
RC=windres
STRIP=strip
GCC_MAJOR := $(shell $(CC) -dumpversion 2>&1 | cut -d'.' -f1) GCC_MAJOR := $(shell $(CC) -dumpversion 2>&1 | cut -d'.' -f1)
GCC_MINOR := $(shell $(CC) -dumpversion 2>&1 | cut -d'.' -f2) GCC_MINOR := $(shell $(CC) -dumpversion 2>&1 | cut -d'.' -f2)
@ -216,7 +218,7 @@ eduke32$(EXESUFFIX): $(GAMEOBJS) $(EOBJ)/$(ENGINELIB) $(JAUDIOLIBDIR)/$(JAUDIOLI
if $(CC) -o $@ $^ $(LIBS) $(STDCPPLIB); then $(LINK_OK); else $(LINK_FAILED); fi if $(CC) -o $@ $^ $(LIBS) $(STDCPPLIB); then $(LINK_OK); else $(LINK_FAILED); fi
ifeq (1,$(RELEASE)) ifeq (1,$(RELEASE))
ifeq (0,$(DEBUGANYWAY)) ifeq (0,$(DEBUGANYWAY))
strip eduke32$(EXESUFFIX) $(STRIP) eduke32$(EXESUFFIX)
endif endif
endif endif
@ -225,7 +227,7 @@ mapster32$(EXESUFFIX): $(EDITOROBJS) $(EOBJ)/$(EDITORLIB) $(EOBJ)/$(ENGINELIB) $
if $(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) $(STDCPPLIB); then $(LINK_OK); else $(LINK_FAILED); fi if $(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) $(STDCPPLIB); then $(LINK_OK); else $(LINK_FAILED); fi
ifeq (1,$(RELEASE)) ifeq (1,$(RELEASE))
ifeq (0,$(DEBUGANYWAY)) ifeq (0,$(DEBUGANYWAY))
strip mapster32$(EXESUFFIX) $(STRIP) mapster32$(EXESUFFIX)
endif endif
endif endif
@ -234,7 +236,7 @@ duke3d_w32$(EXESUFFIX): $(OBJ)/wrapper.$o
if $(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ -Wl; then $(LINK_OK); else $(LINK_FAILED); fi if $(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ -Wl; then $(LINK_OK); else $(LINK_FAILED); fi
ifeq (1,$(RELEASE)) ifeq (1,$(RELEASE))
ifeq (0,$(DEBUGANYWAY)) ifeq (0,$(DEBUGANYWAY))
strip duke3d_w32$(EXESUFFIX) $(STRIP) duke3d_w32$(EXESUFFIX)
endif endif
endif endif
@ -290,7 +292,7 @@ $(OBJ)/%.$o: $(SRC)/jmact/%.c
$(OBJ)/%.$o: $(SRC)/misc/%.rc $(OBJ)/%.$o: $(SRC)/misc/%.rc
$(COMPILE_STATUS) $(COMPILE_STATUS)
if windres -i $< -o $@ --include-dir=$(EINC) --include-dir=$(SRC) -DPOLYMER=$(POLYMER); then $(COMPILE_OK); else $(COMPILE_FAILED); fi if $(RC) -i $< -o $@ --include-dir=$(EINC) --include-dir=$(SRC) -DPOLYMER=$(POLYMER); then $(COMPILE_OK); else $(COMPILE_FAILED); fi
$(OBJ)/%.$o: $(SRC)/util/%.c $(OBJ)/%.$o: $(SRC)/util/%.c
$(COMPILE_STATUS) $(COMPILE_STATUS)

2
polymer/eduke32/source/jaudiolib/Makefile
View file

@ -49,7 +49,7 @@ endif
# OBJECTS=$(SOURCES:%.c=$(OBJ)/%.o) # OBJECTS=$(SOURCES:%.c=$(OBJ)/%.o)
$(OBJNAME): $(OBJECTS) $(OBJNAME): $(OBJECTS)
ar cr $@ $^ $(AR) cr $@ $^
$(OBJECTS): $(OBJ)/%.o: $(SRC)/%.c $(OBJECTS): $(OBJ)/%.o: $(SRC)/%.c
-mkdir -p $(OBJ) -mkdir -p $(OBJ)