Merge pull request #59 from Quuxplusone/mingw

Fix some issues with the MinGW build
This commit is contained in:
Zeno Rogue
2018-11-11 17:23:47 +01:00
committed by GitHub
3 changed files with 3 additions and 1 deletions
+1
View File
@@ -34,6 +34,7 @@ endif MAC
if MINGW if MINGW
nodist_hyperrogue_SOURCES = hyper.res nodist_hyperrogue_SOURCES = hyper.res
hyperrogue_CPPFLAGS += -march=native -DWINDOWS
windres_prefix = ${host_cpu}-w64-mingw32- windres_prefix = ${host_cpu}-w64-mingw32-
endif MINGW endif MINGW
+1
View File
@@ -94,6 +94,7 @@ endif
ifeq (${TOOLCHAIN},mingw) ifeq (${TOOLCHAIN},mingw)
CXXFLAGS_EARLY += -std=c++11 -march=native CXXFLAGS_EARLY += -std=c++11 -march=native
CXXFLAGS_EARLY += -W -Wall -Wextra -Werror CXXFLAGS_EARLY += -W -Wall -Wextra -Werror
CXXFLAGS_EARLY += -Wno-unused-parameter
endif endif
+1 -1
View File
@@ -1499,7 +1499,7 @@ namespace patterns {
#if CAP_TEXTURE #if CAP_TEXTURE
#define REMAP_TEXTURE texture::config.remap() #define REMAP_TEXTURE texture::config.remap()
#else #else
#define REMAP_TEXTURE #define REMAP_TEXTURE (void)0
#endif #endif
void showPattern() { void showPattern() {