From 613ff4341e3dd5e57b30506f83d935ccd0d4147c Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 23 Jan 2017 23:09:02 +0000 Subject: [PATCH] uppsrc: Patches for MACOSX11 git-svn-id: svn://ultimatepp.org/upp/trunk@10750 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/Core.upp | 4 +++- uppsrc/CtrlCore/CtrlCore.upp | 2 +- uppsrc/ide/Debuggers/Debuggers.upp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/uppsrc/Core/Core.upp b/uppsrc/Core/Core.upp index 61e09e355..1b688ccb5 100644 --- a/uppsrc/Core/Core.upp +++ b/uppsrc/Core/Core.upp @@ -11,7 +11,7 @@ library(WIN32 !GUI !GNU !GCC) "ole32 oleaut32 oldnames"; library(LINUX !ANDROID) "pthread dl rt"; -library(BSD) "pthread rt execinfo"; +library(BSD !OSX11) "pthread rt execinfo"; library(WIN32 !MSC8ARM) "advapi32 shell32 winmm mpr"; @@ -23,6 +23,8 @@ library(MSC8ARM WIN32) "coredll.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib library(!WIN32) z; +library(OSX11) pthread; + static_library(ANDROID) cpufeatures; options(XGNU) -O0; diff --git a/uppsrc/CtrlCore/CtrlCore.upp b/uppsrc/CtrlCore/CtrlCore.upp index 4bba8c44d..87cb1ae5b 100644 --- a/uppsrc/CtrlCore/CtrlCore.upp +++ b/uppsrc/CtrlCore/CtrlCore.upp @@ -25,7 +25,7 @@ library(BSD !XLFD !RAINBOW) "Xft fontconfig Xrender freetype expat"; library(LINUX !XLFD !SHARED !RAINBOW GUI) "fontconfig Xrender freetype"; -library(OSX11) "X11 Xft fontconfig Xrender freetype expat"; +library(OSX11) "X11 Xft fontconfig Xrender Xinerama freetype expat"; library(FREEBSD | DRAGONFLY) xcb; diff --git a/uppsrc/ide/Debuggers/Debuggers.upp b/uppsrc/ide/Debuggers/Debuggers.upp index 6b09fdefa..fe5d765c7 100644 --- a/uppsrc/ide/Debuggers/Debuggers.upp +++ b/uppsrc/ide/Debuggers/Debuggers.upp @@ -2,9 +2,10 @@ description "TheIDE - debuggers\377B"; uses ide\Common, - plugin\ndisasm, HexView; +uses(WIN32) plugin\ndisasm; + library(WIN32 GCC) "dbghelp psapi"; file