Yet another attempt to fix building using MINGW. Affects #55
This commit is contained in:
parent
b757b4c590
commit
5a81d83d30
7
Makefile
7
Makefile
@ -6,6 +6,7 @@
|
|||||||
PLATFORM := $(shell uname -s)
|
PLATFORM := $(shell uname -s)
|
||||||
ifneq ($(findstring MINGW,$(PLATFORM)),)
|
ifneq ($(findstring MINGW,$(PLATFORM)),)
|
||||||
PLATFORM := windows32
|
PLATFORM := windows32
|
||||||
|
USE_WINDRES := true
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(PLATFORM),Darwin)
|
ifeq ($(PLATFORM),Darwin)
|
||||||
@ -235,12 +236,18 @@ $(BIN)/SDL/sameboy_debugger.exe: $(CORE_OBJECTS) $(SDL_OBJECTS) $(OBJ)/Windows/r
|
|||||||
-@$(MKDIR) -p $(dir $@)
|
-@$(MKDIR) -p $(dir $@)
|
||||||
$(CC) $^ -o $@ $(LDFLAGS) $(SDL_LDFLAGS) -Wl,/subsystem:console
|
$(CC) $^ -o $@ $(LDFLAGS) $(SDL_LDFLAGS) -Wl,/subsystem:console
|
||||||
|
|
||||||
|
ifneq ($(USE_WINDRES),)
|
||||||
|
$(OBJ)/%.o: %.rc
|
||||||
|
-@$(MKDIR) -p $(dir $@)
|
||||||
|
windres -DVERSION=\"$(VERSION)\" $^ $@
|
||||||
|
else
|
||||||
$(OBJ)/%.res: %.rc
|
$(OBJ)/%.res: %.rc
|
||||||
-@$(MKDIR) -p $(dir $@)
|
-@$(MKDIR) -p $(dir $@)
|
||||||
rc /fo $@ /dVERSION=\"$(VERSION)\" $^
|
rc /fo $@ /dVERSION=\"$(VERSION)\" $^
|
||||||
|
|
||||||
%.o: %.res
|
%.o: %.res
|
||||||
cvtres /OUT:"$@" $^
|
cvtres /OUT:"$@" $^
|
||||||
|
endif
|
||||||
|
|
||||||
# We must provide SDL2.dll with the Windows port.
|
# We must provide SDL2.dll with the Windows port.
|
||||||
$(BIN)/SDL/SDL2.dll:
|
$(BIN)/SDL/SDL2.dll:
|
||||||
|
Loading…
Reference in New Issue
Block a user