diff --git a/Makefile b/Makefile index acbb36c..61e366c 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ PROTOCOL_VERSION?=104 WIN_CC=x86_64-w64-mingw32-gcc WIN_CXX=x86_64-w64-mingw32-g++ WIN_CFLAGS=-O3 #-g3 -fsanitize=address -WIN_CXXFLAGS=-D_WIN32_WINNT=0x0601 -Wall -Wno-unknown-pragmas -std=c++17 -O3 -DPROTOCOL_VERSION=$(PROTOCOL_VERSION) -DGIT_VERSION=\"$(GIT_VERSION)\" -I./src -I./vendor #-g3 -fsanitize=address +WIN_CXXFLAGS=-D_WIN32_WINNT=0x0601 -Wall -Wno-unknown-pragmas -std=c++17 -O3 -DPROTOCOL_VERSION=$(PROTOCOL_VERSION) -DGIT_VERSION=\"$(GIT_VERSION)\" -I./src -I./vendor $(LCFLAGS) #-g3 -fsanitize=address WIN_LDFLAGS=-static -lws2_32 -lwsock32 -lsqlite3 $(LLIBFLAGS) -lstdc++fs #-g3 -fsanitize=address WIN_SERVER=bin/winfusion.exe diff --git a/src/lua/LuaManager.hpp b/src/lua/LuaManager.hpp index 38f9b9f..9e2140a 100644 --- a/src/lua/LuaManager.hpp +++ b/src/lua/LuaManager.hpp @@ -3,7 +3,7 @@ #include "core/CNProtocol.hpp" #include -#ifdef _WIN32 +#ifdef _MSC_VER #include #else #include