mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-15 08:52:00 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@1102 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx
parent
6ae2e2d140
commit
91354444aa
3 changed files with 65 additions and 63 deletions
|
|
@ -227,59 +227,59 @@ include Makefile.deps
|
|||
|
||||
# RULES
|
||||
$(OBJ)/%.$o: $(SRC)/%.nasm
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if $(AS) $(ASFLAGS) $< -o $@; then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
|
||||
$(OBJ)/%.$o: $(SRC)/%.c
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if $(CC) $(CFLAGS) $(OURCFLAGS) -c $< -o $@; then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
|
||||
$(OBJ)/%.$o: $(SRC)/%.m
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if $(CC) $(CFLAGS) $(OURCFLAGS) -c $< -o $@; then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
|
||||
$(OBJ)/%.$o: $(SRC)/%.cpp
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if $(CXX) $(CXXFLAGS) $(OURCXXFLAGS) $(OURCFLAGS) -c $< -o $@; then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
|
||||
$(OBJ)/%.$o: $(SRC)/misc/%.rc
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if $(RC) -i $< -o $@ --include-dir=$(INC) --include-dir=$(SRC); then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
|
||||
$(OBJ)/%.$o: $(SRC)/util/%.c
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if $(CC) $(CFLAGS) $(OURCFLAGS) -c $< -o $@; then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
|
||||
$(OBJ)/%.$o: $(RSRC)/%.c
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if $(CC) $(CFLAGS) $(OURCFLAGS) -c $< -o $@; then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
|
||||
$(OBJ)/editor_banner.$o: $(RSRC)/editor_banner.c
|
||||
|
|
|
|||
|
|
@ -177,12 +177,12 @@ ifneq (0,$(POLYMER))
|
|||
endif
|
||||
endif
|
||||
|
||||
BUILD_STARTED = printf "\033[K\033[1;36mBuild started with $($OURCFLAGS)\033[0m\n"
|
||||
BUILD_FINISHED = printf "\033[K\033[1;36mBuild successful.\033[0m\n"
|
||||
COMPILE_STATUS = printf "\033[K\033[0;33mCompiling \033[1;33m$<\033[0;33m...\033[0m\r"
|
||||
COMPILE_OK = printf "\033[K\033[0;32mSuccessfully compiled \033[1;32m$<\033[0;32m.\033[0m\n"
|
||||
COMPILE_FAILED = printf "\033[K\033[0;31mFailed to compile \033[1;31m$<\033[0;31m!\033[0m\n"; exit 1
|
||||
LINK_STATUS = printf "\033[K\033[0;33mLinking \033[1;33m$@\033[0;33m...\033[0m\r"
|
||||
LINK_OK = printf "\033[K\033[0;32mSuccessfully linked \033[1;32m$@\033[0;32m.\033[0m\n"
|
||||
LINK_FAILED = printf "\033[K\033[0;31mFailed to link \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1
|
||||
BUILD_STARTED = printf "\033[K\033[1;36mBuild started with $(CC) $(OURCFLAGS)\033[0m\n"
|
||||
BUILD_FINISHED = printf "\033[K\033[1;36mBuild successful:\033[0m\n"
|
||||
COMPILE_STATUS = printf "\033[K\033[0;37mCompiling \033[1;37m$<\033[0;37m...\033[0m\r"
|
||||
COMPILE_OK = printf "\033[K\033[0;32mCompiled \033[1;32m$<\033[0;32m.\033[0m\n"
|
||||
COMPILE_FAILED = printf "\033[K\033[0;31mFailed compiling \033[1;31m$<\033[0;31m!\033[0m\n"; exit 1
|
||||
LINK_STATUS = printf "\033[K\033[0;37mLinking \033[1;37m$@\033[0;37m...\033[0m\r"
|
||||
LINK_OK = printf "\033[K\033[0;32mLinked \033[1;32m$@\033[0;32m.\033[0m\n"
|
||||
LINK_FAILED = printf "\033[K\033[0;31mFailed linking \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1
|
||||
|
||||
|
|
|
|||
|
|
@ -242,39 +242,41 @@ all: notice eduke32$(EXESUFFIX) mapster32$(EXESUFFIX)
|
|||
endif
|
||||
|
||||
all:
|
||||
${BUILD_FINISHED}
|
||||
$(BUILD_FINISHED)
|
||||
@ls -l eduke32$(EXESUFFIX)
|
||||
@ls -l mapster32$(EXESUFFIX)
|
||||
|
||||
notice:
|
||||
${BUILD_STARTED}
|
||||
$(BUILD_STARTED)
|
||||
|
||||
eduke32$(EXESUFFIX): $(GAMEOBJS) $(EOBJ)/$(ENGINELIB)
|
||||
${LINK_STATUS}
|
||||
$(LINK_STATUS)
|
||||
if $(CC) -o $@ $^ $(LIBS) $(STDCPPLIB); then \
|
||||
${LINK_OK}; \
|
||||
$(LINK_OK); \
|
||||
else \
|
||||
${LINK_FAILED}; \
|
||||
$(LINK_FAILED); \
|
||||
fi
|
||||
ifeq (1,$(RELEASE))
|
||||
strip eduke32$(EXESUFFIX)
|
||||
endif
|
||||
|
||||
mapster32$(EXESUFFIX): $(EDITOROBJS) $(EOBJ)/$(EDITORLIB) $(EOBJ)/$(ENGINELIB)
|
||||
${LINK_STATUS}
|
||||
$(LINK_STATUS)
|
||||
if $(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS); then \
|
||||
${LINK_OK}; \
|
||||
$(LINK_OK); \
|
||||
else \
|
||||
${LINK_FAILED}; \
|
||||
$(LINK_FAILED); \
|
||||
fi
|
||||
ifeq (1,$(RELEASE))
|
||||
strip mapster32$(EXESUFFIX)
|
||||
endif
|
||||
|
||||
duke3d_w32$(EXESUFFIX): $(OBJ)/wrapper.$o
|
||||
${LINK_STATUS}
|
||||
$(LINK_STATUS)
|
||||
if $(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ -Wl; then \
|
||||
${LINK_OK}; \
|
||||
$(LINK_OK); \
|
||||
else \
|
||||
${LINK_FAILED}; \
|
||||
$(LINK_FAILED); \
|
||||
fi
|
||||
ifeq (1,$(RELEASE))
|
||||
strip duke3d_w32$(EXESUFFIX)
|
||||
|
|
@ -295,65 +297,65 @@ $(EOBJ)/$(EDITORLIB): editorlib
|
|||
|
||||
# RULES
|
||||
$(OBJ)/%.$o: $(SRC)/%.nasm
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
nasm $(NASMFLAGS) $< -o $@
|
||||
$(OBJ)/%.$o: $(SRC)/jaudiolib/%.nasm
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
nasm $(NASMFLAGS) $< -o $@
|
||||
|
||||
$(OBJ)/%.$o: $(SRC)/%.c
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if $(CC) $(CFLAGS) $(OURCFLAGS) -c $< -o $@; then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
|
||||
$(OBJ)/%.$o: $(SRC)/%.cpp
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if $(CXX) $(CXXFLAGS) $(OURCXXFLAGS) $(OURCFLAGS) -c $< -o $@; then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
|
||||
$(OBJ)/%.$o: $(SRC)/jmact/%.c
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if $(CC) $(CFLAGS) $(OURCFLAGS) -c $< -o $@; then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
$(OBJ)/%.$o: $(SRC)/jaudiolib/%.c
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if $(CC) $(CFLAGS) $(OURCFLAGS) -c $< -o $@; then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
|
||||
$(OBJ)/%.$o: $(SRC)/misc/%.rc
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if windres -i $< -o $@ --include-dir=$(EINC) --include-dir=$(SRC); then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
|
||||
$(OBJ)/%.$o: $(SRC)/util/%.c
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if $(CC) $(CFLAGS) $(OURCFLAGS) -c $< -o $@; then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
|
||||
$(OBJ)/%.$o: $(RSRC)/%.c
|
||||
${COMPILE_STATUS}
|
||||
$(COMPILE_STATUS)
|
||||
if $(CC) $(CFLAGS) $(OURCFLAGS) -c $< -o $@; then \
|
||||
${COMPILE_OK}; \
|
||||
$(COMPILE_OK); \
|
||||
else \
|
||||
${COMPILE_FAILED}; \
|
||||
$(COMPILE_FAILED); \
|
||||
fi
|
||||
|
||||
$(OBJ)/game_banner.$o: $(RSRC)/game_banner.c
|
||||
|
|
|
|||
Loading…
Reference in a new issue