From 48296c681d19c55847f0e0a630fbc22e712465fe Mon Sep 17 00:00:00 2001 From: Alcaro Date: Sat, 21 Apr 2018 10:08:50 +0200 Subject: [PATCH] Turns out I broke the Windows build a while ago, how amusing. --- Makefile | 2 +- flips.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e8126de..76f9e68 100644 --- a/Makefile +++ b/Makefile @@ -96,4 +96,4 @@ ifeq ($(TARGET),gtk) endif $(FNAME_$(TARGET)): $(SOURCES) $(XFILES) - $(CXX) $^ -std=c++98 $(CFLAGS_G) $(MOREFLAGS) $(OPTFLAGS) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(LFLAGS) $(XFILES) -o$@ + $(CXX) $^ -std=c++98 $(CFLAGS_G) $(MOREFLAGS) $(OPTFLAGS) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(LFLAGS) -o$@ diff --git a/flips.cpp b/flips.cpp index 673a441..db6b6b0 100644 --- a/flips.cpp +++ b/flips.cpp @@ -388,12 +388,12 @@ LPWSTR config::flatten() LPWSTR ret = (LPWSTR)malloc((len+1)*sizeof(WCHAR)); LPWSTR at = ret; - at += wsprintf(at, "%s", header); + at += wsprintf(at, TEXT("%s"), header); for (size_t i=0;inumentries;i++) { if (this->values[i]!=NULL) { - at += wsprintf(at, "%s=%s\n", this->names[i], this->values[i]); + at += wsprintf(at, TEXT("%s=%s\n"), this->names[i], this->values[i]); } } @@ -429,7 +429,7 @@ config cfg; static LPWSTR EmuGetKey(LPCWSTR filename) { static WCHAR ret[64]; - wsprintf(ret, "emu%s", GetExtension(filename)); + wsprintf(ret, TEXT("emu%s"), GetExtension(filename)); return ret; }