Commit Graph

1685 Commits

Author SHA1 Message Date
Sam Edwards 1eaf1654cd CMake: Don't build egg-mkfont without Freetype 2020-01-07 11:34:34 -07:00
Sam Edwards 9b7bcf2564 Merge branch 'master' into cmake 2019-11-07 21:21:04 -07:00
rdb a72be90f17 Merge branch 'release/1.10.x' 2019-10-29 23:13:22 +01:00
rdb 518dece368 deploy-ng: strip -psn_* argument that macOS passes to GUI apps 2019-10-25 10:37:02 +02:00
Sam Edwards dbe7a2f94b Merge branch 'master' into cmake 2019-09-06 04:05:12 -06:00
Sam Edwards b86332376c CMake: Move Assimp plugin to its own install component 2019-09-06 01:51:51 -06:00
rdb 35135ea0e1 Merge branch 'release/1.10.x' 2019-09-01 21:54:57 +02:00
rdb 191a5b09e9 bin2c: fix compilation warning 2019-09-01 21:46:41 +02:00
rdb 4d254177ba general: Fix missing notifyCategoryProxy.h includes 2019-09-01 21:44:42 +02:00
Sam Edwards 5fa4af9189 CMake: Rely on GNUInstallDirs to specify install paths
This makes multiarch OSes happy as they can dictate that
64-bit libraries go into 'lib64'
2019-08-31 00:48:42 -06:00
Sam Edwards 19ed9f6b47 Merge branch 'master' into cmake 2019-08-24 18:07:12 -06:00
Sam Edwards abc941245e general: Fix missing includes (and one forward declaration) 2019-08-24 18:05:28 -06:00
rdb 5e7e64179b cleanup: fix a host of unprotected debug/spam messages 2019-08-23 18:58:57 +02:00
Sam Edwards c16092fe8a CMake: Workaround for some export errors when doing a static build
This refuses to export/install the p3assimp/p3ptloader/p3txafile
libraries when building statically, because they depend on libraries
that are never installed, and static linkage would require all of the
dependencies to be available.

A more proper fix would involve installing these base libraries, but
only when doing a static build. I suspect nobody will ask for that,
so I haven't done it.
2019-08-19 18:50:53 -06:00
rdb 35efdaebdb mayapath: remove PANDA_INCOMPATIBLE_PYTHON var, no longer used 2019-08-18 22:35:11 +02:00
rdb a40228202b Merge branch 'release/1.10.x' 2019-08-18 22:34:23 +02:00
rdb 2771c29ac9 Make it possible to compile for Maya 2009 2019-08-13 11:49:32 +02:00
rdb 42d112d08d assimp: fix some issues with importing rigged characters 2019-07-25 20:48:03 +02:00
Mitchell Stokes cb7dbfc219 Remove unused files there were referencing ToonTown
Closes #659
2019-06-07 22:11:58 +02:00
Sam Edwards b8f3c7eb63 CMake: Move some symbols from dtool_config.h to -D flags
The symbols moved aren't used in any headers, so they don't
have to be in the installed dtool_config.h. Removing them
keeps the recompiling to a minimum when an optional feature
is toggled.
2019-04-15 22:16:05 -06:00
Sam Edwards 6097d34ead CMake: Neatly format everything for readability and consistency 2019-04-14 22:37:18 -06:00
Sam Edwards 671f15e052 Merge branch 'master' into cmake 2019-04-13 17:29:44 -06:00
rdb 552916efea Merge branch 'release/1.10.x' 2019-04-09 13:31:51 +02:00
rdb eda709bbfc deploy-ng: work around Python 2 crash with logging in GUI apps 2019-04-02 01:31:57 +02:00
rdb 9fd8870766 Merge branch 'release/1.10.x' 2019-03-21 12:44:24 +01:00
Sam Edwards 2a575bf1d8 CMake: Export pandatool targets under "Tools" 2019-03-18 04:18:20 -06:00
Sam Edwards 8b58b5a6ed CMake: Build text-stats and win-stats 2019-03-18 04:18:20 -06:00
Sam Edwards 5c1b525636 CMake: Minor tweaks to gtk-stats
- hyphenate target name
- remove dependency on pystub
2019-03-18 04:18:16 -06:00
Sam Edwards b4a532f1d0 CMake: Add support for building against FCollada 2019-03-18 01:56:38 -06:00
Sam Edwards ff06135412 win-stats: Define WIN32_LEAN_AND_MEAN before including windows.h
This prevents pulling in winsock 1, which will cause compiler
errors when p3net later tries to pull in winsock 2.
2019-03-18 01:53:36 -06:00
Sam Edwards 9c90ad596e CMake: Update for upstream changes 2019-03-12 02:05:06 -06:00
Sam Edwards f8161cc529 Merge branch 'master' into cmake 2019-03-12 02:03:16 -06:00
rdb 92e8b77344 assimp: remove no longer used AssimpLoader pointer 2019-02-20 23:12:06 +01:00
rdb 2574d85049 Merge branch 'release/1.10.x' 2019-02-19 21:38:08 +01:00
rdb 8ba6a0d844 assimp: don't reuse Importer object when loading multiple models
This works around a crash in v4.1.0 when loading multiple .ply files in sequence.  (I have not reproduced the crash with the latest Assimp master.)
2019-02-19 21:23:37 +01:00
rdb 6d927aaa52 Merge tag 'v1.10.1' 2019-02-14 23:21:57 +01:00
rdb 094458a8df xfile: fix read from uninitialized memory (see #554) 2019-02-12 15:40:31 +01:00
rdb 1895abff66 Remove cvscopy and related tools 2019-01-11 23:37:11 +01:00
tc e1e5b907c1 add aiProcess_GenNormals + aiProcess_GenSmoothNormals 2019-01-11 00:07:17 +01:00
rdb 84a1315104 More fixes to work around broken libc++ eof() in Mac OS X 10.7 2019-01-10 21:53:02 +01:00
rdb 3e5f2cf672 flt: fix crash due to macOS libc++ bug in istream::eof()
Apparently eof() in older versions of libc++ returns true if the last character has just been read, whereas the proper behavior is only to return true when attempting to read past the end of the stream.  Since failbit is reliably set in all cases when reading past the length of the stream, we should only trust the result of eof() if fail() also returns true.
2019-01-09 22:54:36 +01:00
rdb 7d398c9aba flt: prevent zero-byte allocation 2019-01-09 22:46:34 +01:00
Sam Edwards 788efb9f6d CMake: Fix build when HAVE_EGG=OFF 2018-12-29 02:51:53 -07:00
Sam Edwards 3b194c75e4 Merge branch 'master' into cmake 2018-12-28 22:15:44 -07:00
rdb 01915a36db Merge branch 'master' into deploy-ng 2018-12-26 23:41:50 +01:00
rdb bd6ef2b0ea Rename CollisionTube to CollisionCapsule (bam 6.44)
Adds ability to register "obsolete" names for certain types under older .bam versions, so that we are still able to write out old .bam files.

Fixes #347
2018-12-23 22:28:06 +01:00
Sam Edwards 99fee1a64d CMake: Assign COMPONENT and EXPORT to all targets 2018-12-06 17:48:44 -07:00
rdb 2664a24e6a deploy-ng: fix redirecting GUI app output to log in VC2015/UCRT
Fixes #461
2018-12-02 20:23:09 +01:00
rdb 3124564040 deploy-ng: fix crash when using local logfile in non-writable dir
Fixes #462
2018-12-02 16:27:08 +01:00
rdb f2f4b4c264 Merge branch 'master' into deploy-ng 2018-12-02 16:26:13 +01:00