incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix windows build

Browse Source
This commit is contained in:
Martin Michelsen
2025-09-02 21:34:19 -07:00
parent e37307acb3
commit 0575f3c9cf
4 changed files with 205 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1
View File
@@ -136,6 +136,7 @@ target_link_libraries(newserv phosg::phosg ${Iconv_LIBRARIES} pthread resource_f
if (WIN32) if (WIN32)
target_compile_definitions(newserv PUBLIC -DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00) target_compile_definitions(newserv PUBLIC -DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00)
target_link_libraries(newserv ws2_32 mswsock bcrypt iphlpapi -static -static-libgcc -static-libstdc++) target_link_libraries(newserv ws2_32 mswsock bcrypt iphlpapi -static -static-libgcc -static-libstdc++)
target_compile_options(newserv PRIVATE -Wa,-mbig-obj)
endif() endif()
add_dependencies(newserv newserv-Revision-cc) add_dependencies(newserv newserv-Revision-cc)
src/ItemParameterTable.hh
+2
View File
@@ -1,5 +1,7 @@
#pragma once #pragma once
#include "WindowsPlatform.hh"
#include <stdint.h> #include <stdint.h>
#include <array> #include <array>
src/QuestScript.cc
+196 -196
View File
File diff suppressed because it is too large Load Diff
src/WindowsPlatform.hh
+6
View File
@@ -9,7 +9,13 @@
#ifdef PHOSG_WINDOWS #ifdef PHOSG_WINDOWS
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#ifdef DELETE
#undef DELETE #undef DELETE
#endif
#ifdef ERROR
#undef ERROR #undef ERROR
#endif
#ifdef PASSTHROUGH
#undef PASSTHROUGH #undef PASSTHROUGH
#endif #endif
#endif