fix: Resolve issues with windows compilation
This commit is contained in:
parent
be734b47c3
commit
e31243397e
6
Makefile
6
Makefile
@ -1,5 +1,5 @@
|
|||||||
export MAKEFLAGS += --silent -r
|
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 ldflags=-L$(bin)/$(profile)
|
||||||
export lib=ppc$(version-major)-
|
export lib=ppc$(version-major)-
|
||||||
export profile=release
|
export profile=release
|
||||||
@ -49,8 +49,8 @@ export binary = $(bin)/$(output)$(version-major)-windows.exe
|
|||||||
build: version
|
build: version
|
||||||
echo ======================== Compiling =========================
|
echo ======================== Compiling =========================
|
||||||
make -f scripts/common.mak
|
make -f scripts/common.mak
|
||||||
if exist $(bin)\++c-windows.exe del $(bin)\++c-windows.exe
|
if exist "$(subst /,\,$(bin)\$(output).exe)" del "$(subst /,\,$(bin)\$(output).exe)"
|
||||||
mklink /H $(bin)\$(output).exe "$(subst /,\,$(binary))" > NUL
|
mklink /H "$(subst /,\,$(bin)\$(output).exe)" "$(subst /,\,$(binary))" > NUL
|
||||||
|
|
||||||
clear:
|
clear:
|
||||||
if exist $(subst /,\,$(oldbin)) rmdir /s /q $(subst /,\,$(oldbin))
|
if exist $(subst /,\,$(oldbin)) rmdir /s /q $(subst /,\,$(oldbin))
|
||||||
|
@ -11,6 +11,9 @@
|
|||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <conio.h>
|
#include <conio.h>
|
||||||
|
|
||||||
|
#undef ERROR
|
||||||
|
#undef INFO
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
Loading…
Reference in New Issue
Block a user