Browse Source

CMake: Remove remaining references to HAVE_CARBON

Sam Edwards 6 years ago
parent
commit
12036c7ed0
3 changed files with 1 additions and 8 deletions
  1. 0 2
      dtool/Config.cmake
  2. 0 1
      dtool/dtool_config.h.in
  3. 1 5
      panda/metalibs/pandagl/CMakeLists.txt

+ 0 - 2
dtool/Config.cmake

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

+ 0 - 1
dtool/dtool_config.h.in

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

+ 1 - 5
panda/metalibs/pandagl/CMakeLists.txt

@@ -17,15 +17,11 @@ elseif(HAVE_COCOA)
   set(PANDAGL_PIPE_TYPE "CocoaGraphicsPipe")
   set(PANDAGL_PIPE_INCLUDE "cocoaGraphicsPipe.h")
 
-elseif(HAVE_CARBON)
-  list(APPEND PANDAGL_LINK_TARGETS p3osxdisplay)
-  set(PANDAGL_PIPE_TYPE "osxGraphicsPipe")
-
 else()
   message("") # Add extra line before error
   message(SEND_ERROR
     "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()