diff --git a/deps/gsc-tool b/deps/gsc-tool deleted file mode 160000 index b859638..0000000 --- a/deps/gsc-tool +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b8596387037ce2a5400605b8a0b53ef79387256b diff --git a/deps/premake/gsc-tool.lua b/deps/premake/gsc-tool.lua deleted file mode 100644 index 10f6135..0000000 --- a/deps/premake/gsc-tool.lua +++ /dev/null @@ -1,62 +0,0 @@ -gsc_tool = { - source = path.join(dependencies.basePath, "gsc-tool"), -} - -function gsc_tool.import() - links { "xsk-gsc-iw5-pc", "xsk-gsc-utils" } - gsc_tool.includes() -end - -function gsc_tool.includes() - includedirs { - path.join(gsc_tool.source, "include"), - } -end - -function gsc_tool.project() - project "xsk-gsc-utils" - kind "StaticLib" - language "C++" - - files { - path.join(gsc_tool.source, "include/xsk/utils/*.hpp"), - path.join(gsc_tool.source, "src/utils/*.cpp"), - } - - includedirs { - path.join(gsc_tool.source, "include"), - } - - zlib.includes() - - project "xsk-gsc-iw5-pc" - kind "StaticLib" - language "C++" - - filter "action:vs*" - buildoptions "/Zc:__cplusplus" - filter {} - - files { - path.join(gsc_tool.source, "include/xsk/stdinc.hpp"), - - path.join(gsc_tool.source, "include/xsk/gsc/engine/iw5_pc.hpp"), - path.join(gsc_tool.source, "src/gsc/engine/iw5_pc.cpp"), - - path.join(gsc_tool.source, "src/gsc/engine/iw5_pc_code.cpp"), - path.join(gsc_tool.source, "src/gsc/engine/iw5_pc_func.cpp"), - path.join(gsc_tool.source, "src/gsc/engine/iw5_pc_meth.cpp"), - path.join(gsc_tool.source, "src/gsc/engine/iw5_pc_token.cpp"), - - path.join(gsc_tool.source, "src/gsc/*.cpp"), - - path.join(gsc_tool.source, "src/gsc/common/*.cpp"), - path.join(gsc_tool.source, "include/xsk/gsc/common/*.hpp"), - } - - includedirs { - path.join(gsc_tool.source, "include"), - } -end - -table.insert(dependencies, gsc_tool) diff --git a/src/stdinc.hpp b/src/stdinc.hpp index 0c40cb8..81acaec 100644 --- a/src/stdinc.hpp +++ b/src/stdinc.hpp @@ -8,8 +8,6 @@ #pragma warning(disable: 4996) #pragma warning(disable: 26812) -#include - #define DLL_EXPORT extern "C" __declspec(dllexport) #define WIN32_LEAN_AND_MEAN #include @@ -36,10 +34,11 @@ using namespace std::literals; +#define __has_warning(...) 0 + #include #include - #include "utils/memory.hpp" #include "utils/string.hpp" #include "utils/hook.hpp"