From 8065be4f575662a6a1f373d5bd0b9fa06cc126e4 Mon Sep 17 00:00:00 2001 From: Roger Hughston Date: Fri, 10 Feb 2006 20:13:14 +0000 Subject: [PATCH] More Motion in osx Land --- panda/metalibs/panda/Sources.pp | 4 ++-- panda/metalibs/pandaegg/Sources.pp | 2 +- panda/metalibs/pandaexpress/Sources.pp | 2 +- panda/metalibs/pandafx/Sources.pp | 2 +- panda/metalibs/pandagl/Sources.pp | 3 ++- panda/metalibs/pandaphysics/Sources.pp | 2 +- panda/src/audio/Sources.pp | 2 +- panda/src/chan/Sources.pp | 2 +- panda/src/char/Sources.pp | 2 +- panda/src/collide/Sources.pp | 2 +- panda/src/device/Sources.pp | 2 +- panda/src/dgraph/Sources.pp | 2 +- panda/src/display/Sources.pp | 2 +- panda/src/distort/Sources.pp | 2 +- panda/src/downloader/Sources.pp | 2 +- panda/src/downloadertools/Sources.pp | 2 +- panda/src/effects/Sources.pp | 2 +- panda/src/egg/Sources.pp | 2 +- panda/src/egg2pg/Sources.pp | 2 +- panda/src/event/Sources.pp | 2 +- panda/src/express/Sources.pp | 2 +- panda/src/framework/Sources.pp | 2 +- panda/src/glgsg/Sources.pp | 2 +- panda/src/glgsg/glgsg.h | 9 +++++++-- panda/src/glstuff/glGraphicsStateGuardian_src.h | 2 +- panda/src/glstuff/glImmediateModeSender_src.cxx | 8 ++++---- panda/src/gobj/Sources.pp | 2 +- panda/src/grutil/Sources.pp | 2 +- panda/src/gsgbase/Sources.pp | 2 +- panda/src/lerp/Sources.pp | 2 +- panda/src/linmath/Sources.pp | 2 +- panda/src/mathutil/Sources.pp | 2 +- panda/src/pandabase/Sources.pp | 2 +- panda/src/parametrics/Sources.pp | 2 +- panda/src/particlesystem/Sources.pp | 2 +- panda/src/pgraph/Sources.pp | 2 +- panda/src/pgui/Sources.pp | 2 +- panda/src/physics/Sources.pp | 2 +- panda/src/pnmimage/Sources.pp | 2 +- panda/src/pnmimagetypes/Sources.pp | 2 +- panda/src/pstatclient/Sources.pp | 2 +- panda/src/putil/Sources.pp | 2 +- panda/src/recorder/Sources.pp | 2 +- panda/src/text/Sources.pp | 2 +- panda/src/tform/Sources.pp | 2 +- 45 files changed, 56 insertions(+), 50 deletions(-) diff --git a/panda/metalibs/panda/Sources.pp b/panda/metalibs/panda/Sources.pp index 3f229761df..5e4597da21 100644 --- a/panda/metalibs/panda/Sources.pp +++ b/panda/metalibs/panda/Sources.pp @@ -17,14 +17,14 @@ parametrics pnm \ pnmimagetypes pnmimage sgattrib sgmanip sgraph sgraphutil \ switchnode pnmtext text tform tiff lerp loader putil \ - audio pgui pandabase helix + audio pgui pandabase helix #define LOCAL_LIBS \ downloader express pandabase #define OTHER_LIBS \ pandaexpress:m \ interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #if $[LINK_IN_GL] #define BUILDING_DLL $[BUILDING_DLL] BUILDING_PANDAGL diff --git a/panda/metalibs/pandaegg/Sources.pp b/panda/metalibs/pandaegg/Sources.pp index ab5d0c6969..73e302bc4b 100644 --- a/panda/metalibs/pandaegg/Sources.pp +++ b/panda/metalibs/pandaegg/Sources.pp @@ -12,7 +12,7 @@ #define LOCAL_LIBS putil express #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolbase:c dtoolutil:c dtool:m + dtoolbase:c dtoolutil:c dtool:m prc:c #begin metalib_target #define TARGET pandaegg diff --git a/panda/metalibs/pandaexpress/Sources.pp b/panda/metalibs/pandaexpress/Sources.pp index 3afec87d1d..18f418a2b1 100644 --- a/panda/metalibs/pandaexpress/Sources.pp +++ b/panda/metalibs/pandaexpress/Sources.pp @@ -9,7 +9,7 @@ #define USE_PACKAGES net #define COMPONENT_LIBS downloader ipc express pandabase -#define OTHER_LIBS dtoolconfig dtool +#define OTHER_LIBS dtoolconfig dtool dconfig prc interrogatedb dtoolutil dtoolbase #begin metalib_target #define TARGET pandaexpress diff --git a/panda/metalibs/pandafx/Sources.pp b/panda/metalibs/pandafx/Sources.pp index c92a280256..4154bc0202 100644 --- a/panda/metalibs/pandafx/Sources.pp +++ b/panda/metalibs/pandafx/Sources.pp @@ -11,7 +11,7 @@ distort effects #define LOCAL_LIBS putil express #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolbase:c dtoolutil:c dtool:m + dtoolbase:c dtoolutil:c dtool:m prc:c #begin metalib_target #define TARGET pandafx diff --git a/panda/metalibs/pandagl/Sources.pp b/panda/metalibs/pandagl/Sources.pp index 6d1a7459e2..2939392bf6 100644 --- a/panda/metalibs/pandagl/Sources.pp +++ b/panda/metalibs/pandagl/Sources.pp @@ -17,7 +17,8 @@ #endif #define LOCAL_LIBS gsgbase display express -#define OTHER_LIBS dtoolconfig dtool +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m prc:c #begin metalib_target #define TARGET pandagl diff --git a/panda/metalibs/pandaphysics/Sources.pp b/panda/metalibs/pandaphysics/Sources.pp index bc2faaa1e4..cd1814c63e 100644 --- a/panda/metalibs/pandaphysics/Sources.pp +++ b/panda/metalibs/pandaphysics/Sources.pp @@ -16,7 +16,7 @@ #define LOCAL_LIBS linmath putil express #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolbase:c dtoolutil:c dtool:m + dtoolbase:c dtoolutil:c dtool:m prc:c #begin metalib_target #define TARGET pandaphysics diff --git a/panda/src/audio/Sources.pp b/panda/src/audio/Sources.pp index db4d07e9d0..3763fd829c 100644 --- a/panda/src/audio/Sources.pp +++ b/panda/src/audio/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define BUILD_DIRECTORY $[HAVE_AUDIO] #begin lib_target diff --git a/panda/src/chan/Sources.pp b/panda/src/chan/Sources.pp index 221c18e930..34f4706248 100644 --- a/panda/src/chan/Sources.pp +++ b/panda/src/chan/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET chan diff --git a/panda/src/char/Sources.pp b/panda/src/char/Sources.pp index 5164171953..626aa882cf 100644 --- a/panda/src/char/Sources.pp +++ b/panda/src/char/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET char diff --git a/panda/src/collide/Sources.pp b/panda/src/collide/Sources.pp index e01948e57b..a5ef63e45a 100644 --- a/panda/src/collide/Sources.pp +++ b/panda/src/collide/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET collide diff --git a/panda/src/device/Sources.pp b/panda/src/device/Sources.pp index 463ac818a6..51a0c823e9 100644 --- a/panda/src/device/Sources.pp +++ b/panda/src/device/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET device diff --git a/panda/src/dgraph/Sources.pp b/panda/src/dgraph/Sources.pp index 0c3225f590..b71f98e105 100644 --- a/panda/src/dgraph/Sources.pp +++ b/panda/src/dgraph/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET dgraph diff --git a/panda/src/display/Sources.pp b/panda/src/display/Sources.pp index 965cbb5f3b..3e95d6a23e 100644 --- a/panda/src/display/Sources.pp +++ b/panda/src/display/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define WIN_SYS_LIBS $[WIN_SYS_LIBS] ws2_32.lib #begin lib_target diff --git a/panda/src/distort/Sources.pp b/panda/src/distort/Sources.pp index e8f3168927..40ece88892 100644 --- a/panda/src/distort/Sources.pp +++ b/panda/src/distort/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define OSX_SYS_LIBS mx #begin lib_target diff --git a/panda/src/downloader/Sources.pp b/panda/src/downloader/Sources.pp index 49533f9f0d..f6f07d9573 100644 --- a/panda/src/downloader/Sources.pp +++ b/panda/src/downloader/Sources.pp @@ -1,6 +1,6 @@ #define LOCAL_LIBS express pandabase #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c prc:c dtool:m #define USE_PACKAGES zlib net openssl #begin lib_target diff --git a/panda/src/downloadertools/Sources.pp b/panda/src/downloadertools/Sources.pp index df140a8a47..7a50646339 100644 --- a/panda/src/downloadertools/Sources.pp +++ b/panda/src/downloadertools/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m pystub + dtoolutil:c dtoolbase:c dtool:m pystub prc:c #define LOCAL_LIBS downloader express event #begin bin_target diff --git a/panda/src/effects/Sources.pp b/panda/src/effects/Sources.pp index 9d522c8fdb..3c6d2c5a52 100644 --- a/panda/src/effects/Sources.pp +++ b/panda/src/effects/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define USE_PACKAGES cg #begin lib_target #define TARGET effects diff --git a/panda/src/egg/Sources.pp b/panda/src/egg/Sources.pp index f95036e3e3..50d4e7f78b 100644 --- a/panda/src/egg/Sources.pp +++ b/panda/src/egg/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define YACC_PREFIX eggyy #define LFLAGS -i #define USE_PACKAGES zlib diff --git a/panda/src/egg2pg/Sources.pp b/panda/src/egg2pg/Sources.pp index 8a10eafa1a..ab2fe7025e 100644 --- a/panda/src/egg2pg/Sources.pp +++ b/panda/src/egg2pg/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define USE_PACKAGES nurbspp diff --git a/panda/src/event/Sources.pp b/panda/src/event/Sources.pp index b5d6c354c3..7d097fff28 100644 --- a/panda/src/event/Sources.pp +++ b/panda/src/event/Sources.pp @@ -1,6 +1,6 @@ #define LOCAL_LIBS putil express pandabase #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET event diff --git a/panda/src/express/Sources.pp b/panda/src/express/Sources.pp index e0c7812139..936c0c4f75 100644 --- a/panda/src/express/Sources.pp +++ b/panda/src/express/Sources.pp @@ -1,6 +1,6 @@ #define LOCAL_LIBS pandabase #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET express diff --git a/panda/src/framework/Sources.pp b/panda/src/framework/Sources.pp index 4cb1a9e9cf..bb1cdbe5c0 100644 --- a/panda/src/framework/Sources.pp +++ b/panda/src/framework/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET framework diff --git a/panda/src/glgsg/Sources.pp b/panda/src/glgsg/Sources.pp index 4d078c3403..c19048c62e 100644 --- a/panda/src/glgsg/Sources.pp +++ b/panda/src/glgsg/Sources.pp @@ -1,6 +1,6 @@ #define BUILD_DIRECTORY $[HAVE_GL] #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define USE_PACKAGES gl cg cggl #begin lib_target #define TARGET glgsg diff --git a/panda/src/glgsg/glgsg.h b/panda/src/glgsg/glgsg.h index d1b3a304bd..c10d9a66bf 100644 --- a/panda/src/glgsg/glgsg.h +++ b/panda/src/glgsg/glgsg.h @@ -43,8 +43,13 @@ #include #endif -#include -#include +#ifdef IS_OSX +#include +#include +#else +#include +#include +#endif #include "glstuff_src.h" diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.h b/panda/src/glstuff/glGraphicsStateGuardian_src.h index d01fc25002..4d70165f79 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.h +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.h @@ -58,7 +58,7 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, const GLfloat typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, const GLfloat s, const GLfloat t, const GLfloat r, const GLfloat q); typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); - +typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture); class CLP(GeomContext); //////////////////////////////////////////////////////////////////// diff --git a/panda/src/glstuff/glImmediateModeSender_src.cxx b/panda/src/glstuff/glImmediateModeSender_src.cxx index b24bb46905..40bfa6b312 100644 --- a/panda/src/glstuff/glImmediateModeSender_src.cxx +++ b/panda/src/glstuff/glImmediateModeSender_src.cxx @@ -558,7 +558,7 @@ issue_vertex() { } #endif // NDEBUG - (*_func)(1, (const unsigned int *)&d); + (*_func)(1, (const GLuint *)&d); } //////////////////////////////////////////////////////////////////// @@ -577,7 +577,7 @@ issue_vertex() { } #endif // NDEBUG - (*_func)(2, (const unsigned int *)d); + (*_func)(2, (const GLuint *)d); } //////////////////////////////////////////////////////////////////// @@ -596,7 +596,7 @@ issue_vertex() { } #endif // NDEBUG - (*_func)(3, (const unsigned int *)d); + (*_func)(3, (const GLuint *)d); } //////////////////////////////////////////////////////////////////// @@ -615,7 +615,7 @@ issue_vertex() { } #endif // NDEBUG - (*_func)(4, (const unsigned int *)d); + (*_func)(4, (const GLuint *)d); } #endif // SUPPORT_IMMEDIATE_MODE diff --git a/panda/src/gobj/Sources.pp b/panda/src/gobj/Sources.pp index 39daf38a59..1d55f47f64 100644 --- a/panda/src/gobj/Sources.pp +++ b/panda/src/gobj/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define OSX_SYS_LIBS mx #begin lib_target diff --git a/panda/src/grutil/Sources.pp b/panda/src/grutil/Sources.pp index 9846a4ebed..a610f9ca9b 100644 --- a/panda/src/grutil/Sources.pp +++ b/panda/src/grutil/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define USE_PACKAGES opencv diff --git a/panda/src/gsgbase/Sources.pp b/panda/src/gsgbase/Sources.pp index 35628c83e7..505676a792 100644 --- a/panda/src/gsgbase/Sources.pp +++ b/panda/src/gsgbase/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET gsgbase diff --git a/panda/src/lerp/Sources.pp b/panda/src/lerp/Sources.pp index d10c22e50c..98ce7e3d08 100644 --- a/panda/src/lerp/Sources.pp +++ b/panda/src/lerp/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET lerp diff --git a/panda/src/linmath/Sources.pp b/panda/src/linmath/Sources.pp index a98f889bb7..3cfc96bf00 100644 --- a/panda/src/linmath/Sources.pp +++ b/panda/src/linmath/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET linmath diff --git a/panda/src/mathutil/Sources.pp b/panda/src/mathutil/Sources.pp index 12dfa3b2f7..90b34de2fc 100644 --- a/panda/src/mathutil/Sources.pp +++ b/panda/src/mathutil/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET mathutil diff --git a/panda/src/pandabase/Sources.pp b/panda/src/pandabase/Sources.pp index 38b05cbfde..7557a8eebf 100644 --- a/panda/src/pandabase/Sources.pp +++ b/panda/src/pandabase/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET pandabase diff --git a/panda/src/parametrics/Sources.pp b/panda/src/parametrics/Sources.pp index f0f7da81b3..b063cd89ca 100644 --- a/panda/src/parametrics/Sources.pp +++ b/panda/src/parametrics/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define USE_PACKAGES nurbspp diff --git a/panda/src/particlesystem/Sources.pp b/panda/src/particlesystem/Sources.pp index 5693e06b49..0dcf9816a2 100644 --- a/panda/src/particlesystem/Sources.pp +++ b/panda/src/particlesystem/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET particlesystem diff --git a/panda/src/pgraph/Sources.pp b/panda/src/pgraph/Sources.pp index b8709e3eff..1e6296cd58 100644 --- a/panda/src/pgraph/Sources.pp +++ b/panda/src/pgraph/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define LOCAL_LIBS \ lerp event gsgbase gobj putil linmath \ downloader express pandabase pstatclient diff --git a/panda/src/pgui/Sources.pp b/panda/src/pgui/Sources.pp index dcb09b3ff9..a667619423 100644 --- a/panda/src/pgui/Sources.pp +++ b/panda/src/pgui/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET pgui diff --git a/panda/src/physics/Sources.pp b/panda/src/physics/Sources.pp index 2f01ec769a..deeb80534b 100644 --- a/panda/src/physics/Sources.pp +++ b/panda/src/physics/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET physics diff --git a/panda/src/pnmimage/Sources.pp b/panda/src/pnmimage/Sources.pp index 723f7b87ab..3980e96b5e 100644 --- a/panda/src/pnmimage/Sources.pp +++ b/panda/src/pnmimage/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define USE_PACKAGES zlib #begin lib_target diff --git a/panda/src/pnmimagetypes/Sources.pp b/panda/src/pnmimagetypes/Sources.pp index b950cee39d..759c4dfe75 100644 --- a/panda/src/pnmimagetypes/Sources.pp +++ b/panda/src/pnmimagetypes/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define USE_PACKAGES jpeg png zlib tiff #begin lib_target diff --git a/panda/src/pstatclient/Sources.pp b/panda/src/pstatclient/Sources.pp index 0620dd6eaf..8d00aaf8e2 100644 --- a/panda/src/pstatclient/Sources.pp +++ b/panda/src/pstatclient/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define LOCAL_LIBS \ diff --git a/panda/src/putil/Sources.pp b/panda/src/putil/Sources.pp index 3fc6d4a5b4..a9c824e142 100644 --- a/panda/src/putil/Sources.pp +++ b/panda/src/putil/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define LOCAL_LIBS express pandabase #define USE_PACKAGES zlib diff --git a/panda/src/recorder/Sources.pp b/panda/src/recorder/Sources.pp index 7217bf08e1..ee3836c485 100644 --- a/panda/src/recorder/Sources.pp +++ b/panda/src/recorder/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #define LOCAL_LIBS dgraph putil express pandabase #begin lib_target diff --git a/panda/src/text/Sources.pp b/panda/src/text/Sources.pp index db91aaff10..c9e9de00cb 100644 --- a/panda/src/text/Sources.pp +++ b/panda/src/text/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define USE_PACKAGES freetype zlib diff --git a/panda/src/tform/Sources.pp b/panda/src/tform/Sources.pp index d52422327d..4b076b6e66 100644 --- a/panda/src/tform/Sources.pp +++ b/panda/src/tform/Sources.pp @@ -1,5 +1,5 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + dtoolutil:c dtoolbase:c dtool:m prc:c #begin lib_target #define TARGET tform