Commit Graph

2036 Commits

Author SHA1 Message Date
rdb e9f4e44e99 Add panda/src/configfiles 2014-05-30 12:27:21 +02:00
rdb e3b663da3a Merge branch 'master' into cmake 2014-05-29 16:32:59 +02:00
rdb 5b967671fa Fix Python 3 build issue with iterator extensions 2014-05-23 13:42:26 +00:00
Sam Edwards 93af05d67a Merge branch 'master' into cmake 2014-04-23 21:14:26 -06:00
Sam Edwards df24806a2e dtool: Move all parser-inc includes to their proper subdirectories. 2014-04-17 01:34:16 -06:00
Sam Edwards ea4043d689 cmake: Build pstatclient. 2014-04-16 06:31:04 -06:00
Sam Edwards 127dfe7c4d cmake: Add FFMPEG compilation support. 2014-04-11 03:38:08 -06:00
Sam Edwards 21ecc1fc04 CMake: Default HAVE_AUDIO on. 2014-04-03 15:10:31 -06:00
Sam Edwards 5ce2173903 CMake: Fix typo. 2014-03-31 20:31:08 -06:00
Sam Edwards a39be0ed75 Merge branch 'cmake-cfs-remainder' into cmake
Conflicts:
	panda/CMakeLists.txt
2014-03-30 01:21:09 -06:00
Sam Edwards cc6720e6c4 CMake: Fix trailing-newline issue with autodetected Python install paths. 2014-03-30 01:20:06 -06:00
Sam Edwards d27bc99fcb Merge remote-tracking branch 'upstream/master' into cmake
Conflicts:
	direct/src/directnotify/DirectNotify.py
	direct/src/showbase/PythonUtil.py
2014-03-29 15:57:11 -06:00
rdb d5d5de1d7e Make iterators work with interrogate by mapping None to NULL for the iternext method. Not the best solution, but is easy and fits most use cases. 2014-03-27 15:15:58 +00:00
rdb 31a192f27b Fix interrogate understanding of PY_VERSION_HEX 2014-03-09 11:43:08 +00:00
rdb ae4bddd7f7 Fix Python 3 compile issue 2014-03-09 01:00:23 +00:00
Sam Edwards 0bcce442c3 CMake: Properly link against the proper frameworks on OS X. 2014-03-02 21:57:15 -07:00
Sam Edwards 0c04655f86 CMake: Explicitly require Python 2.x. 2014-03-02 18:33:47 -07:00
rdb c213712600 fix windows build when the module is in different dll than the library defs 2014-02-20 18:38:35 +00:00
rdb 5f2c0a6e04 Big commit aiding in separation of Python bindings:
* Most extension functions have been moved to C++.
 * In makepanda, Python bindings are compiled into panda3d/<module>.pyd.
2014-02-20 13:33:26 +00:00
rdb 3070f18c24 Add assertion in a case where I've seen an occasional crash 2014-02-19 08:38:57 +00:00
Sam Edwards f972221357 CMake: Detect ODE. 2014-02-08 16:20:57 -07:00
Sam Edwards 5e78a80acc CMake: When HAVE_PYTHON, detect the Python install directories. Also, only include Python directories if HAVE_PYTHON. 2014-02-06 16:33:27 -07:00
Sam Edwards cc7e03f5eb CMake: Fix typo. 2014-02-06 13:37:46 -07:00
Sam Edwards f5f2f39a30 CMake: Remove PYTHON_LIBRARIES link from interrogatedb; it's unused there. 2014-02-05 18:09:18 -07:00
Sam Edwards ad7f590ca3 Merge branch 'cmake' into cmake-cfs-install
Conflicts:
	panda/CMakeLists.txt
	panda/src/audio/CMakeLists.txt
	panda/src/movies/CMakeLists.txt
	panda/src/pnmtext/CMakeLists.txt
2014-02-05 17:38:03 -07:00
rdb 872ffb12c1 Merge pull request #4 from kestred/cmake-cfs-igate2
Update Interrogate.cmake; generate panda3d.core and panda3d.egg modules.
2014-02-05 20:34:19 +01:00
Sam Edwards 5e77793b0f CMake: Add some install(...) directives. 2014-02-04 22:43:23 -07:00
Sam Edwards 2a85cd7a5b CMake: dtoolbase/dtoolutil may need to link against Python. 2014-02-04 11:28:06 -07:00
Sam Edwards c4ade7f8b9 Move OpenSSL parser-inc files to openssl/ subdirectory. 2014-02-03 12:09:20 -07:00
rdb 710568fb28 HAVE_GTK -> HAVE_GTK2 2014-02-02 12:31:06 +01:00
rdb 6e86570b9a ppremake-style output report 2014-02-02 10:12:18 +01:00
Sam Edwards 33142e0b59 CMake: Build interrogate_module. 2014-01-30 13:18:11 -07:00
kestred f5fbe25724 Build shared libs by default in cmake builds. 2014-01-30 10:32:25 -07:00
kestred f8b901f60a Fix incorrect licensing and add missing parens after else. 2014-01-30 09:39:29 -07:00
kestred bb19d8cb23 Enable package filtering by license in Distribution builds, and disable most packages by default in MinSizeRel builds. 2014-01-30 09:33:20 -07:00
kestred b2f928ade5 Add "Distribution" build type, and improve doc/organization for basic CMake stuff. 2014-01-30 08:55:19 -07:00
kestred f0a7a4d12b Removed outmoded DO_DEBUG for IS_DEBUG_BUILD 2014-01-30 07:00:01 -07:00
kestred b04ebdda98 Have package_option automatically generate option library targets instead of checking in every instance they're used. 2014-01-30 06:47:09 -07:00
kestred 9a9f06c984 Config.cmake: Add X11 location and option. 2014-01-30 04:16:26 -07:00
kestred 99b4760991 dtool/Config.cmake: Add missing empty option to BUILD_IPHONE. 2014-01-30 04:01:57 -07:00
Sam Edwards 82854ac1e8 Under CMake, generate dtool_config.h into build/include/ instead of build/ and use build/include/ as the global include directory. 2014-01-29 10:41:01 -07:00
Sam Edwards 456967069e Fix syntax problems in Config.cmake. 2014-01-27 10:09:07 -07:00
kestred d1c5c20983 Continue Config.pp port and cleanup build-type conditional defaults. 2014-01-26 22:21:19 -07:00
kestred 4a2ee83df9 Rearrange Config.cmake and cotninue porting Config.pp 2014-01-26 21:33:49 -07:00
Sam Edwards 0f89ef1e7b In CMake, link a few libraries against other libraries that they depend on. 2014-01-26 18:06:37 -07:00
kestred a0eeccf381 Add missing compiler define in CMakeLists for dtool/metalibs/dtoolconfig. 2014-01-26 11:22:48 -07:00
kestred b25669af6f Merge remote-tracking branch 'upstream/master' into cmake 2014-01-25 22:17:41 -07:00
kestred 25771c6629 Cleanup some dtool/package.cmake find variables. 2014-01-22 00:53:32 -07:00
kestred dd495b5573 Rename FindFFTW to FindFFTW3 and comment out configuration for it. FindFFTW3 was implemented, but Panda expects FFTW2. 2014-01-19 12:07:20 -07:00
kestred f4bf740362 Fix HAVE_LOCKF in dtoolbase.h for python headers that don't define it. 2014-01-19 17:33:19 -07:00