mirror of
https://github.com/ONLYOFFICE/core.git
synced 2026-02-10 18:05:41 +08:00
Fix linux/macos build
This commit is contained in:
@ -18,14 +18,7 @@ DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY
|
||||
ADD_DEPENDENCY(graphics, kernel, UnicodeConverter)
|
||||
|
||||
core_windows {
|
||||
DEFINES += \
|
||||
JAS_WIN_MSVC_BUILD \
|
||||
WIN32
|
||||
|
||||
DEFINES -= UNICODE
|
||||
DEFINES -= _DEBUG
|
||||
|
||||
message(windows)
|
||||
|
||||
LIBS += -lAdvapi32
|
||||
LIBS += -lShell32
|
||||
|
||||
@ -33,11 +33,8 @@
|
||||
#include <iostream>
|
||||
#include <map>
|
||||
#include <iomanip>
|
||||
#include <filesystem>
|
||||
|
||||
#ifdef WIN32
|
||||
#include <locale.h>
|
||||
#endif
|
||||
|
||||
#include "help.h"
|
||||
#include "../common/File.h"
|
||||
@ -777,9 +774,7 @@ int wmain(int argc, wchar_t** argv)
|
||||
int main(int argc, char** argv)
|
||||
#endif
|
||||
{
|
||||
#ifdef _WIN32
|
||||
setlocale(LC_ALL, "");
|
||||
#endif
|
||||
|
||||
CPluginsManager oManager;
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ TARGET = pluginsmanager
|
||||
|
||||
DEFINES += KERNEL_USE_DYNAMIC_LIBRARY
|
||||
|
||||
ADD_DEPENDENCY(kernel, kernel_network)
|
||||
ADD_DEPENDENCY(kernel, kernel_network, UnicodeConverter)
|
||||
|
||||
core_windows {
|
||||
DEFINES += \
|
||||
|
||||
Reference in New Issue
Block a user