Browse Source

CMake: Remove some unused #cmakedefine directives

Sam Edwards 6 years ago
parent
commit
865d824313

+ 0 - 3
dtool/Config.cmake

@@ -237,9 +237,6 @@ mark_as_advanced(DEFAULT_PRC_DIR PRC_DIR_ENVVARS PRC_PATH_ENVVARS
 #
 
 
-option(HAVE_P3D_PLUGIN
-  "You may define this to build or develop the plugin." OFF)
-
 option(HAVE_P3D_RTDIST
   "You may define this to build or develop the Panda3D rtdist,
 the environment packaged up for distribution with the plugin."

+ 0 - 41
dtool/dtool_config.h.in

@@ -30,18 +30,9 @@
 /* Define to use doubles for most numbers, intead of single-precision floats. */
 #cmakedefine STDFLOAT_DOUBLE
 
-/* Define if we have Maya available. */
-#cmakedefine HAVE_MAYA
-
-/* Define if we have libRocket available and built with the Rocket Debugger. */
-#cmakedefine HAVE_ROCKET_DEBUGGER
-
 /* Define if we have built libRocket available and built with Python support. */
 #cmakedefine HAVE_ROCKET_PYTHON
 
-/* Define if we have SoftImage available. */
-#cmakedefine HAVE_SOFTIMAGE
-
 /* Define if we have FCollada available. */
 #cmakedefine HAVE_FCOLLADA
 
@@ -90,15 +81,9 @@
 /* Define if we have libsquish installed.  */
 #cmakedefine HAVE_SQUISH
 
-/* Define if we have Berkeley DB installed.  */
-#cmakedefine HAVE_BDB
-
 /* Define if we have CG installed.  */
 #cmakedefine HAVE_CG
 
-/* Define for dxerr.h instead of dxerr9.h. */
-#cmakedefine USE_GENERIC_DXERR_LIBRARY
-
 /* Define if we have zlib installed.  */
 #cmakedefine HAVE_ZLIB
 
@@ -117,12 +102,6 @@
 #cmakedefine HAVE_SWSCALE
 #cmakedefine HAVE_SWRESAMPLE
 
-/* Define if we have GLX installed and want to build for GLX.  */
-#cmakedefine HAVE_GLX
-
-/* Define if we have Windows-GL installed and want to build for Wgl.  */
-#cmakedefine HAVE_WGL
-
 /* Define if we have DirectX installed and want to build for DX.  */
 #cmakedefine HAVE_DX9
 
@@ -209,11 +188,6 @@
    variables that must be visible outside of the prc directory are
    exported here. */
 
-/* The filename that specifies the public keys to import into
-   config. */
-#cmakedefine PRC_PUBLIC_KEYS_FILENAME
-#cmakedefine PRC_PUBLIC_KEYS_INCLUDE
-
 /* Define if you want to save the descriptions for ConfigVariables. */
 #cmakedefine PRC_SAVE_DESCRIPTIONS
 
@@ -304,9 +278,6 @@
 /* Define if you have the <limits.h> header file.  */
 #cmakedefine PHAVE_LIMITS_H
 
-/* Define if you have the <minmax.h> header file.  */
-#cmakedefine PHAVE_MINMAX_H
-
 /* Define if you have the <sstream> header file.  */
 #cmakedefine PHAVE_SSTREAM
 
@@ -356,21 +327,9 @@
 // If we are to build the native net interfaces.
 #cmakedefine WANT_NATIVE_NET
 
-/* Turn off warnings for using scanf and such */
-#if 0
-	#cmakedefine _CRT_SECURE_NO_WARNINGS
-        #pragma warning( disable : 4996 4275 4267 4099 4049 4013 4005 )
-#endif
-
 /* Static linkage instead of the normal dynamic linkage? */
 #cmakedefine LINK_ALL_STATIC
 
-/* Define to compile the plugin code. */
-#cmakedefine HAVE_P3D_PLUGIN
-
-/* Define to compile for Cocoa or Carbon on Mac OS X. */
-#cmakedefine HAVE_COCOA
-
 /* Platform-identifying defines. */
 #cmakedefine IS_OSX
 #cmakedefine IS_LINUX

+ 0 - 8
dtool/src/dtoolbase/pandaVersion.h.in

@@ -71,11 +71,3 @@
    distributable package may be downloaded, or empty string if there
    is no associated package. */
 #define PANDA_PACKAGE_HOST_URL "@PANDA_PACKAGE_HOST_URL@"
-
-#if HAVE_P3D_PLUGIN
-/* Similar definitions for the plugin versioning, if in use. */
-#define P3D_PLUGIN_MAJOR_VERSION @P3D_PLUGIN_MAJOR_VERSION@
-#define P3D_PLUGIN_MINOR_VERSION @P3D_PLUGIN_MINOR_VERSION@
-#define P3D_PLUGIN_SEQUENCE_VERSION @P3D_PLUGIN_SEQUENCE_VERSION@
-#define P3D_COREAPI_VERSION_STR "@P3D_COREAPI_VERSION_STR@"
-#endif

+ 0 - 10
panda/src/display/CMakeLists.txt

@@ -108,13 +108,3 @@ if(NOT BUILD_METALIBS)
     ARCHIVE COMPONENT CoreDevel)
 endif()
 install(FILES ${P3DISPLAY_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
-
-if(OSX_PLATFORM AND HAVE_P3D_PLUGIN)
-  # We build a static library of just these files, so the plugin can
-  # link with it in direct/src/plugin, without pulling in the rest of
-  # Panda.
-  add_library(p3subprocbuffer
-    subprocessWindowBuffer.h
-    subprocessWindowBuffer.I
-    subprocessWindowBuffer.cxx)
-endif()