pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Oleg Korshul
2025-08-26 16:07:41 +03:00
parent a988e6741c
commit 30da4b631f
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Common/3dParty/boost/boost.pri
View File

@ -39,6 +39,8 @@ core_windows {
core_win_arm64:VS_ARCH=a64 core_win_arm64:VS_ARCH=a64
vs2019:VS_VERSION=142 vs2019:VS_VERSION=142
DEFINES += BOOST_USE_WINDOWS_H BOOST_WINAPI_NO_REDECLARATIONS
BOOST_POSTFIX = -vc$${VS_VERSION}-mt-$${VS_DEBUG}$${VS_ARCH}-1_72 BOOST_POSTFIX = -vc$${VS_VERSION}-mt-$${VS_DEBUG}$${VS_ARCH}-1_72
core_boost_libs:LIBS += -L$$CORE_BOOST_LIBS -llibboost_system$$BOOST_POSTFIX -llibboost_filesystem$$BOOST_POSTFIX core_boost_libs:LIBS += -L$$CORE_BOOST_LIBS -llibboost_system$$BOOST_POSTFIX -llibboost_filesystem$$BOOST_POSTFIX

2
Common/base.pri
View File

@ -198,7 +198,7 @@ core_windows {
DEFINES += WIN32 _WIN32 DEFINES += WIN32 _WIN32
DEFINES += NOMINMAX DEFINES += NOMINMAX
DEFINES += WIN32_LEAN_AND_MEAN #DEFINES += WIN32_LEAN_AND_MEAN
# use default _ITERATOR_DEBUG_LEVEL value # use default _ITERATOR_DEBUG_LEVEL value
#core_debug:DEFINES += "_ITERATOR_DEBUG_LEVEL=0" #core_debug:DEFINES += "_ITERATOR_DEBUG_LEVEL=0"

4
DesktopEditor/cximage/CxImage/ximaraw.cpp
View File

@ -22,10 +22,6 @@
#if CXIMAGE_SUPPORT_RAW #if CXIMAGE_SUPPORT_RAW
#if defined(WIN32) || defined(_WIN32_WCE)
#include <winsock2.h>
#endif
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#if CXIMAGE_SUPPORT_DECODE #if CXIMAGE_SUPPORT_DECODE
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////