From 323e33ed363fe117e27a638ec95b9cf5bd12cce9 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 20 Jun 2019 20:46:03 +0100 Subject: [PATCH] Fixes for non-MSVC2003 builds --- Makefile | 3 ++- src/WindowsWrapper.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f8b56220..3c4bb65b 100644 --- a/Makefile +++ b/Makefile @@ -213,6 +213,7 @@ all: $(BUILD_DIRECTORY)/$(FILENAME) $(BUILD_DIRECTORY)/data @echo Finished $(BUILD_DIRECTORY)/data: $(DATA_DIRECTORY) + @mkdir -p $(@D) @rm -rf $(BUILD_DIRECTORY)/data @cp -r $(DATA_DIRECTORY) $(BUILD_DIRECTORY)/data @@ -243,7 +244,7 @@ obj/bin2h: bin2h/bin2h.c include $(wildcard $(DEPENDENCIES)) -obj/$(FILENAME)/win_icon.o: res/ICON/ICON.rc res/ICON/0.ico res/ICON/ICON_MINI.ico +obj/$(FILENAME)/win_icon.o: $(ASSETS_DIRECTORY)/resources/ICON/ICON.rc $(ASSETS_DIRECTORY)/resources/ICON/0.ico $(ASSETS_DIRECTORY)/resources/ICON/ICON_MINI.ico @mkdir -p $(@D) @windres $< $@ diff --git a/src/WindowsWrapper.h b/src/WindowsWrapper.h index 0994a3f2..ca0d6229 100644 --- a/src/WindowsWrapper.h +++ b/src/WindowsWrapper.h @@ -1,6 +1,6 @@ #pragma once -#ifdef NONPORTABLE +#ifdef WINDOWS #include // Avoid name collisions #undef DrawText