Remove usage of __APPLE_QUARTZ__ (#673)
This commit is contained in:
parent
f1b2e92f07
commit
160eb2926d
@ -101,7 +101,6 @@ if (APPLE)
|
||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_HAS_THREAD_API_PTHREAD")
|
||||
endif (NOT(${CMAKE_SYSTEM_VERSION} VERSION_LESS 17.0.0))
|
||||
else ()
|
||||
set (__APPLE_QUARTZ__ 1)
|
||||
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa")
|
||||
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa")
|
||||
endif (OPTION_APPLE_X11)
|
||||
|
@ -147,16 +147,6 @@
|
||||
|
||||
#cmakedefine01 HAVE_X11_XREGION_H
|
||||
|
||||
/*
|
||||
* __APPLE_QUARTZ__:
|
||||
*
|
||||
* All Apple implementations are now based on Quartz and Cocoa,
|
||||
* so this flag should always be on for Mac OS X. This flag has
|
||||
* no meaning on operating systems other than Mac OS X.
|
||||
*/
|
||||
|
||||
#cmakedefine __APPLE_QUARTZ__ 1
|
||||
|
||||
/*
|
||||
* HAVE_GL_OVERLAY:
|
||||
*
|
||||
|
10
configh.in
10
configh.in
@ -146,16 +146,6 @@
|
||||
|
||||
#define HAVE_X11_XREGION_H 0
|
||||
|
||||
/*
|
||||
* __APPLE_QUARTZ__:
|
||||
*
|
||||
* All Apple implementations are now based on Quartz and Cocoa,
|
||||
* so this flag should always be on for Mac OS X. This flag has
|
||||
* no meaning on operating systems other than Mac OS X.
|
||||
*/
|
||||
|
||||
#undef __APPLE_QUARTZ__
|
||||
|
||||
/*
|
||||
* HAVE_GL_OVERLAY:
|
||||
*
|
||||
|
@ -952,8 +952,6 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
|
||||
HLINKS="#"
|
||||
])
|
||||
], [darwin*], [
|
||||
AC_DEFINE([__APPLE_QUARTZ__])
|
||||
|
||||
BUILD="OSX"
|
||||
|
||||
# MacOS X uses Cocoa for graphics.
|
||||
|
@ -99,7 +99,7 @@ static void draw_current_rect() {
|
||||
|
||||
static void erase_current_rect() {
|
||||
#ifdef USE_XOR
|
||||
# ifdef __APPLE_QUARTZ__ // PORTME: Fl_Window_Driver - platform overlay
|
||||
# ifdef __APPLE__ // PORTME: Fl_Window_Driver - platform overlay
|
||||
fl_rect(px, py, pw, ph);
|
||||
# else
|
||||
draw_current_rect();
|
||||
|
Loading…
Reference in New Issue
Block a user