TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Remove remaining references to HAVE_CARBON

Browse Source
This commit is contained in:
Sam Edwards 2019-04-14 22:38:25 -06:00
parent 6097d34ead
commit 12036c7ed0
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtool/Config.cmake
View File

@ -477,8 +477,6 @@ endif()
cmake_dependent_option(HAVE_COCOA "Enable Cocoa. Requires Mac OS X." ON cmake_dependent_option(HAVE_COCOA "Enable Cocoa. Requires Mac OS X." ON
"APPLE" OFF) "APPLE" OFF)
cmake_dependent_option(HAVE_CARBON "Enable Carbon. Requires Mac OS X." OFF
"APPLE" OFF)
# #
# Miscellaneous settings # Miscellaneous settings

1
dtool/dtool_config.h.in
View File

@ -370,7 +370,6 @@
/* Define to compile for Cocoa or Carbon on Mac OS X. */ /* Define to compile for Cocoa or Carbon on Mac OS X. */
#cmakedefine HAVE_COCOA #cmakedefine HAVE_COCOA
#cmakedefine HAVE_CARBON
/* Platform-identifying defines. */ /* Platform-identifying defines. */
#cmakedefine IS_OSX #cmakedefine IS_OSX

6
panda/metalibs/pandagl/CMakeLists.txt
View File

@ -17,15 +17,11 @@ elseif(HAVE_COCOA)
set(PANDAGL_PIPE_TYPE "CocoaGraphicsPipe") set(PANDAGL_PIPE_TYPE "CocoaGraphicsPipe")
set(PANDAGL_PIPE_INCLUDE "cocoaGraphicsPipe.h") set(PANDAGL_PIPE_INCLUDE "cocoaGraphicsPipe.h")
elseif(HAVE_CARBON)
list(APPEND PANDAGL_LINK_TARGETS p3osxdisplay)
set(PANDAGL_PIPE_TYPE "osxGraphicsPipe")
else() else()
message("") # Add extra line before error message("") # Add extra line before error
message(SEND_ERROR message(SEND_ERROR
"When compiling with OpenGL (HAVE_GL), at least one of: "When compiling with OpenGL (HAVE_GL), at least one of:
HAVE_WGL, HAVE_COCOA, HAVE_CARBON, or HAVE_GLX must be defined.") HAVE_WGL, HAVE_COCOA, or HAVE_GLX must be defined.")
endif() endif()