Fixed needless deep generation, which caused errors when compiling the Cocoa GUI when SDL is not installed
This commit is contained in:
parent
d03a1fbd16
commit
553f700b79
21
Makefile
21
Makefile
@ -1,10 +1,16 @@
|
|||||||
ifeq ($(shell uname -s),Darwin)
|
ifeq ($(shell uname -s),Darwin)
|
||||||
default: cocoa
|
DEFAULT := cocoa
|
||||||
else
|
else
|
||||||
default: sdl
|
DEFAULT := sdl
|
||||||
endif
|
endif
|
||||||
|
|
||||||
VERSION := 0.5
|
VERSION := 0.5
|
||||||
|
default: $(DEFAULT)
|
||||||
|
|
||||||
|
ifeq ($(MAKECMDGOALS),)
|
||||||
|
MAKECMDGOALS := $(DEFAULT)
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
BIN := build/bin
|
BIN := build/bin
|
||||||
OBJ := build/obj
|
OBJ := build/obj
|
||||||
@ -50,8 +56,15 @@ SDL_OBJECTS := $(patsubst %,$(OBJ)/%.o,$(SDL_SOURCES))
|
|||||||
ALL_OBJECTS := $(CORE_OBJECTS) $(COCOA_OBJECTS) $(SDL_OBJECTS)
|
ALL_OBJECTS := $(CORE_OBJECTS) $(COCOA_OBJECTS) $(SDL_OBJECTS)
|
||||||
|
|
||||||
# Automatic dependency generation
|
# Automatic dependency generation
|
||||||
|
ifneq ($(MAKECMDGOALS),clean)
|
||||||
-include $(ALL_OBJECTS:.o=.dep)
|
-include $(CORE_OBJECTS:.o=.dep)
|
||||||
|
ifneq ($(filter $(MAKECMDGOALS),sdl),)
|
||||||
|
-include $(SDL_OBJECTS:.o=.dep)
|
||||||
|
endif
|
||||||
|
ifneq ($(filter $(MAKECMDGOALS),cocoa),)
|
||||||
|
-include $(COCOA_OBJECTS:.o=.dep)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
$(OBJ)/%.dep: %
|
$(OBJ)/%.dep: %
|
||||||
-@mkdir -p $(dir $@)
|
-@mkdir -p $(dir $@)
|
||||||
|
Loading…
Reference in New Issue
Block a user