duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for non-MSVC2003 builds

Browse source
This commit is contained in:
Clownacy 2019-06-20 20:46:03 +01:00
parent 078dc440c7
commit 323e33ed36
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -213,6 +213,7 @@ all: $(BUILD_DIRECTORY)/$(FILENAME) $(BUILD_DIRECTORY)/data
@echo Finished @echo Finished
$(BUILD_DIRECTORY)/data: $(DATA_DIRECTORY) $(BUILD_DIRECTORY)/data: $(DATA_DIRECTORY)
@mkdir -p $(@D)
@rm -rf $(BUILD_DIRECTORY)/data @rm -rf $(BUILD_DIRECTORY)/data
@cp -r $(DATA_DIRECTORY) $(BUILD_DIRECTORY)/data @cp -r $(DATA_DIRECTORY) $(BUILD_DIRECTORY)/data
@ -243,7 +244,7 @@ obj/bin2h: bin2h/bin2h.c
include $(wildcard $(DEPENDENCIES)) 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) @mkdir -p $(@D)
@windres $< $@ @windres $< $@

2
src/WindowsWrapper.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#ifdef NONPORTABLE #ifdef WINDOWS
#include <Windows.h> #include <Windows.h>
// Avoid name collisions // Avoid name collisions
#undef DrawText #undef DrawText