Fix Makefiles
This commit is contained in:
@@ -6,21 +6,21 @@ ifeq ($(VERBOSE_BUILD),true)
|
||||
DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
|
||||
DO_CXX=$(CXX) $(CFLAGS) -o $@ -c $<
|
||||
else
|
||||
DO_CC=@$(ECHO) "CC: $@" ;\
|
||||
DO_CC=@$(ECHO) "CC: $@" &&\
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
DO_CXX=@$(ECHO) "CXX: $@" ;\
|
||||
DO_CXX=@$(ECHO) "CXX: $@" &&\
|
||||
$(CXX) $(CFLAGS) -o $@ -c $<
|
||||
endif
|
||||
|
||||
#####################
|
||||
# Game Declarations #
|
||||
#####################
|
||||
GAME_HEADS := $(GAMELIB_HEADS) Game$(SLASH)GameEnts.h Game$(SLASH)GameMap.h
|
||||
GAME_HEADS := Game/GameEnts.h Game/GameMap.h
|
||||
GAME_OBJS := \
|
||||
$(BUILDDIR)$(SLASH)Game.o$(SLASH)GameEnts.o \
|
||||
$(BUILDDIR)$(SLASH)Game.o$(SLASH)GameMap.o \
|
||||
$(BUILDDIR)$(SLASH)Game.o$(SLASH)main.o
|
||||
RES_GAME_OUT := $(BUILDDIR)$(SLASH)$(RES_GAME)
|
||||
$(BUILDDIR)/GameEnts.o \
|
||||
$(BUILDDIR)/GameMap.o \
|
||||
$(BUILDDIR)/main.o
|
||||
RES_GAME_OUT := $(BUILDDIR)/$(RES_GAME)
|
||||
|
||||
|
||||
#################
|
||||
@@ -34,15 +34,14 @@ all: .FORCE $(BUILDDIR) $(RES_GAME_OUT)
|
||||
|
||||
$(BUILDDIR):
|
||||
$(MKDIR) $(BUILDDIR)
|
||||
$(MKDIR) $(BUILDDIR)$(SLASH)Game.o
|
||||
|
||||
full-clean: clean
|
||||
(cd $(GAMELIB_DIR) && make clean $(GAMELIB_MAKEPARAMS))
|
||||
|
||||
clean:
|
||||
$(RM) $(GAME_OBJS) $(RES_GAME_OUT)
|
||||
$(RM) $(BUILDDIR)
|
||||
|
||||
run: $(BUILDDIR) $(RES_GAME_OUT)
|
||||
run: .FORCE $(BUILDDIR) $(RES_GAME_OUT)
|
||||
$(LAUNCHER) ./$(RES_GAME_OUT) debug
|
||||
|
||||
rebuild: clean all
|
||||
@@ -52,11 +51,11 @@ rebuild: clean all
|
||||
# Game Rules #
|
||||
##############
|
||||
|
||||
$(BUILDDIR)$(SLASH)Game.o$(SLASH)GameEnts.o: src$(SLASH)GameEnts.c $(HEADS)
|
||||
$(BUILDDIR)/GameEnts.o: src/GameEnts.c $(HEADS)
|
||||
$(DO_CC)
|
||||
$(BUILDDIR)$(SLASH)Game.o$(SLASH)GameMap.o: src$(SLASH)GameMap.c $(HEADS)
|
||||
$(BUILDDIR)/GameMap.o: src/GameMap.c $(HEADS)
|
||||
$(DO_CC)
|
||||
$(BUILDDIR)$(SLASH)Game.o$(SLASH)main.o: src$(SLASH)main.c $(HEADS)
|
||||
$(BUILDDIR)/main.o: src/main.c $(HEADS)
|
||||
$(DO_CC)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user