From e31243397eda010600fbfedb747f08a23935979c Mon Sep 17 00:00:00 2001 From: TopchetoEU <36534413+TopchetoEU@users.noreply.github.com> Date: Sat, 24 Sep 2022 11:47:05 +0300 Subject: [PATCH] fix: Resolve issues with windows compilation --- Makefile | 6 +++--- src/main/main.cc | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3b5ffb1..c5fc586 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ export MAKEFLAGS += --silent -r -export flags=-std=c++17 -Wall -Wno-main -Wno-trigraphs -Wno-missing-braces -Wno-stringop-overflow -m32 +export flags=-std=c++17 -Wall -Wno-main -Wno-trigraphs -Wno-missing-braces -Wno-stringop-overflow export ldflags=-L$(bin)/$(profile) export lib=ppc$(version-major)- export profile=release @@ -49,8 +49,8 @@ export binary = $(bin)/$(output)$(version-major)-windows.exe build: version echo ======================== Compiling ========================= make -f scripts/common.mak - if exist $(bin)\++c-windows.exe del $(bin)\++c-windows.exe - mklink /H $(bin)\$(output).exe "$(subst /,\,$(binary))" > NUL + if exist "$(subst /,\,$(bin)\$(output).exe)" del "$(subst /,\,$(bin)\$(output).exe)" + mklink /H "$(subst /,\,$(bin)\$(output).exe)" "$(subst /,\,$(binary))" > NUL clear: if exist $(subst /,\,$(oldbin)) rmdir /s /q $(subst /,\,$(oldbin)) diff --git a/src/main/main.cc b/src/main/main.cc index 5494818..871054b 100644 --- a/src/main/main.cc +++ b/src/main/main.cc @@ -11,6 +11,9 @@ #include #include +#undef ERROR +#undef INFO + #endif #include