diff --git a/dtool/Config.cmake b/dtool/Config.cmake index 61b213f7be..4c38728b51 100644 --- a/dtool/Config.cmake +++ b/dtool/Config.cmake @@ -610,11 +610,6 @@ endif() # Miscellaneous settings # -option(HAVE_WIN_TOUCHINPUT -"Define this if you are building on Windows 7 or better, and you -want your Panda build to run only on Windows 7 or better, and you -need to use the Windows touchinput interfaces." OFF) - option(WANT_NATIVE_NET "Define this true to build the low-level native network implementation. Normally this should be set true." ON) diff --git a/dtool/LocalSetup.cmake b/dtool/LocalSetup.cmake index d153e465b9..609d4174ab 100644 --- a/dtool/LocalSetup.cmake +++ b/dtool/LocalSetup.cmake @@ -14,42 +14,15 @@ include(CheckTypeSize) include(TestBigEndian) include(TestForSTDNamespace) -# Define if we have libjpeg installed. -check_include_file_cxx(jpegint.h PHAVE_JPEGINT_H) - # Check if this is a big-endian system. test_big_endian(WORDS_BIGENDIAN) -# Check if the compiler supports namespaces. -set(HAVE_NAMESPACE ${CMAKE_STD_NAMESPACE}) - -# Define if fstream::open() accepts a third parameter for umask. -check_cxx_source_compiles(" -#include -std::fstream fs; -int main(int argc, char *argv[]) { fs.open(\"file\", std::fstream::out, 0644); return 0; } -" HAVE_OPEN_MASK) - # Define if we have lockf(). check_cxx_source_compiles(" #include int main(int argc, char *argv[]) { lockf(0, F_LOCK, 0); return 0; } " PHAVE_LOCKF) -# Check if we have a wchar_t type. -check_type_size(wchar_t HAVE_WCHAR_T) - -# Check if we have a wstring type. -check_cxx_source_compiles(" -#include -std::wstring str; -int main(int argc, char *argv[]) { return 0; } -" HAVE_WSTRING) - -# Define if the C++ compiler supports the typename keyword. -# Since we now require C++11, this is a given. -set(HAVE_TYPENAME 1) - # Define if we can trust the compiler not to insert extra bytes in # structs between base structs and derived structs. check_c_source_runs(" @@ -93,13 +66,6 @@ if(UNIX) set(IOCTL_TERMINAL_WIDTH 1) endif() -# Do the system headers define a "streamsize" typedef? -check_cxx_source_compiles(" -#include -std::streamsize ss; -int main(int argc, char *argv[]) { return 0; } -" HAVE_STREAMSIZE) - # Do the system headers define key ios typedefs like ios::openmode # and ios::fmtflags? check_cxx_source_compiles(" @@ -163,7 +129,6 @@ check_include_file_cxx(unistd.h PHAVE_UNISTD_H) check_include_file_cxx(utime.h PHAVE_UTIME_H) check_include_file_cxx(glob.h PHAVE_GLOB_H) check_include_file_cxx(dirent.h PHAVE_DIRENT_H) -check_include_file_cxx(sys/soundcard.h PHAVE_SYS_SOUNDCARD_H) check_include_file_cxx(ucontext.h PHAVE_UCONTEXT_H) #TODO doesn't work on OSX, use sys/ucontext.h check_include_file_cxx(linux/input.h PHAVE_LINUX_INPUT_H) check_include_file_cxx(stdint.h PHAVE_STDINT_H) @@ -176,9 +141,6 @@ check_include_file_cxx(typeinfo HAVE_RTTI) include(CheckCXXCompilerFlag) check_cxx_compiler_flag(-msse2 HAVE_SSE2) -#/* Define if needed to have 64-bit file i/o */ -#$[cdefine __USE_LARGEFILE64] - # Set LINK_ALL_STATIC if we're building everything as static libraries. # Also set the library type used for "modules" appropriately. if(BUILD_SHARED_LIBS) diff --git a/dtool/dtool_config.h.in b/dtool/dtool_config.h.in index 165acc4636..9cf6ba5b8d 100644 --- a/dtool/dtool_config.h.in +++ b/dtool/dtool_config.h.in @@ -15,18 +15,9 @@ /* Define if we have RAD game tools, Miles Sound System installed. */ #cmakedefine HAVE_RAD_MSS -/* Define if we have FMODex installed. */ -#cmakedefine HAVE_FMODEX - -/* Define if we have OpenAL installed. */ -#cmakedefine HAVE_OPENAL - /* Define if we have Freetype 2.0 or better available. */ #cmakedefine HAVE_FREETYPE -/* Define if we are using SpeedTree. */ -#cmakedefine HAVE_SPEEDTREE - /* Define if we want to compile in a default font. */ #cmakedefine COMPILE_IN_DEFAULT_FONT @@ -35,7 +26,6 @@ /* Define if we have Maya available. */ #cmakedefine HAVE_MAYA -#cmakedefine MAYA_PRE_5_0 /* Define if we have libRocket available and built with the Rocket Debugger. */ #cmakedefine HAVE_ROCKET_DEBUGGER @@ -61,7 +51,6 @@ /* Define if we have libjpeg installed. */ #cmakedefine HAVE_JPEG -#cmakedefine PHAVE_JPEGINT_H /* Define to build video-for-linux. */ #cmakedefine HAVE_VIDEO4LINUX @@ -95,12 +84,6 @@ /* Define if we have CG installed. */ #cmakedefine HAVE_CG -/* Define if we have CGGL installed. */ -#cmakedefine HAVE_CGGL - -/* Define if we have CGDX9 installed. */ -#cmakedefine HAVE_CGDX9 - /* Define for dxerr.h instead of dxerr9.h. */ #cmakedefine USE_GENERIC_DXERR_LIBRARY @@ -114,12 +97,6 @@ #cmakedefine MIN_GL_VERSION_MINOR #endif -/* Define if we have OpenGL ES installed and want to build for GLES. */ -#cmakedefine HAVE_GLES - -/* Define if we have OpenGL ES installed and want to build for GLES2. */ -#cmakedefine HAVE_GLES2 - /* Define if we have OpenCV installed and want to build for OpenCV. */ #cmakedefine HAVE_OPENCV #cmakedefine OPENCV_VER_23 @@ -129,18 +106,9 @@ #cmakedefine HAVE_SWSCALE #cmakedefine HAVE_SWRESAMPLE -/* Define if we have ODE installed and want to build for ODE. */ -#cmakedefine HAVE_ODE - -/* Define if we have AWESOMIUM installed and want to build for AWESOMIUM. */ -#cmakedefine HAVE_AWESOMIUM - /* Define if we have GLX installed and want to build for GLX. */ #cmakedefine HAVE_GLX -/* Define if we have EGL installed and want to build for EGL. */ -#cmakedefine HAVE_EGL - /* Define if we have Windows-GL installed and want to build for Wgl. */ #cmakedefine HAVE_WGL @@ -160,15 +128,6 @@ /* Define if we have X11. */ #cmakedefine HAVE_X11 -/* Define if we have the XFree86-DGA extension. */ -#cmakedefine HAVE_XF86DGA - -/* Define if we have the XRandR extension. */ -#cmakedefine HAVE_XRANDR - -/* Define if we have the XCursor extension. */ -#cmakedefine HAVE_XCURSOR - /* Define if we want to compile the threading code. */ #cmakedefine HAVE_THREADS @@ -197,9 +156,6 @@ /* Define if we want to compile the audio code. */ #cmakedefine HAVE_AUDIO -/* Define if we have bison and flex available. */ -#cmakedefine HAVE_BISON - /* Define if we want to use PStats. */ #cmakedefine DO_PSTATS @@ -255,24 +211,9 @@ byte first (like Motorola and SPARC, unlike Intel and VAX). */ #cmakedefine WORDS_BIGENDIAN -/* Define if the C++ compiler uses namespaces. */ -#cmakedefine HAVE_NAMESPACE - -/* Define if fstream::open() accepts a third parameter for umask. */ -#cmakedefine HAVE_OPEN_MASK - /* Define if we have a lockf() function. */ #cmakedefine PHAVE_LOCKF -/* Define if some header file defines wchar_t. */ -#cmakedefine HAVE_WCHAR_T - -/* Define if the header file defines wstring. */ -#cmakedefine HAVE_WSTRING - -/* Define if the C++ compiler supports the typename keyword. */ -#cmakedefine HAVE_TYPENAME - /* Define if we can trust the compiler not to insert extra bytes in structs between base structs and derived structs. */ #cmakedefine SIMPLE_STRUCT_POINTERS @@ -298,9 +239,6 @@ /* Define if you have ioctl(TIOCGWINSZ) to determine terminal width. */ #cmakedefine IOCTL_TERMINAL_WIDTH -/* Do the system headers define a "streamsize" typedef? */ -#cmakedefine HAVE_STREAMSIZE - /* Do the system headers define key ios typedefs like ios::openmode and ios::fmtflags? */ #cmakedefine HAVE_IOS_TYPEDEFS @@ -382,10 +320,6 @@ /* Define if you have the header file. */ #cmakedefine PHAVE_DIRENT_H -/* Do we have (and presumably a Linux-style audio - interface)? */ -#cmakedefine PHAVE_SYS_SOUNDCARD_H - /* Do we have (and therefore makecontext() / swapcontext())? */ #cmakedefine PHAVE_UCONTEXT_H @@ -405,15 +339,9 @@ /* Is the code being compiled with the Tau profiler's instrumentor? */ #cmakedefine USE_TAU -/* Define if needed to have 64-bit file i/o */ -#cmakedefine __USE_LARGEFILE64 - // To activate the DELETED_CHAIN macros. #cmakedefine USE_DELETED_CHAIN -// To build the Windows TOUCHINPUT interfaces (requires Windows 7). -#cmakedefine HAVE_WIN_TOUCHINPUT - // If we are to build the native net interfaces. #cmakedefine WANT_NATIVE_NET