TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

move from Gtk-- 1.x to gtk+-2.0

Browse Source
This commit is contained in:
David Rose 2006-01-17 03:59:48 +00:00
parent 8567173ece
commit 9f2768dfed
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dtool/Config.pp
View File

@ -622,10 +622,10 @@
#define CHROMIUM_LIBS spuload #define CHROMIUM_LIBS spuload
#defer HAVE_CHROMIUM $[libtest $[CHROMIUM_LPATH],$[CHROMIUM_LIBS]] #defer HAVE_CHROMIUM $[libtest $[CHROMIUM_LPATH],$[CHROMIUM_LIBS]]
// Is Gtk-- installed? How should we run the gtkmm-config program? // Is gtk+-2 installed? This is only needed to build the pstats
// This matters only to programs in PANDATOOL. // program on Unix (or non-Windows) platforms.
#define GTKMM_CONFIG gtkmm-config #define PKG_CONFIG pkg-config
#defer HAVE_GTKMM $[bintest $[GTKMM_CONFIG]] #define HAVE_GTK
// Do we have Freetype 2.0 (or better)? If available, this package is // Do we have Freetype 2.0 (or better)? If available, this package is
// used to generate dynamic in-the-world text from font files. // used to generate dynamic in-the-world text from font files.

18
dtool/Package.pp
View File

@ -236,8 +236,8 @@
#set CHROMIUM_LIBS $[CHROMIUM_LIBS] #set CHROMIUM_LIBS $[CHROMIUM_LIBS]
#set HAVE_CHROMIUM $[HAVE_CHROMIUM] #set HAVE_CHROMIUM $[HAVE_CHROMIUM]
#set GTKMM_CONFIG $[GTKMM_CONFIG] #set PKG_CONFIG $[PKG_CONFIG]
#set HAVE_GTKMM $[HAVE_GTKMM] #set HAVE_GTK $[HAVE_GTK]
#set FREETYPE_CONFIG $[FREETYPE_CONFIG] #set FREETYPE_CONFIG $[FREETYPE_CONFIG]
#set HAVE_FREETYPE $[HAVE_FREETYPE] #set HAVE_FREETYPE $[HAVE_FREETYPE]
@ -255,14 +255,14 @@
// Now infer a few more variables based on what was defined. // Now infer a few more variables based on what was defined.
#if $[and $[HAVE_GTKMM],$[GTKMM_CONFIG]] #if $[and $[HAVE_GTK],$[PKG_CONFIG]]
#define cflags $[shell $[GTKMM_CONFIG] --cflags] #define cflags $[shell $[PKG_CONFIG] gtk+-2.0 --cflags]
#define libs $[shell $[GTKMM_CONFIG] --libs] #define libs $[shell $[PKG_CONFIG] gtk+-2.0 --libs]
#define GTKMM_CFLAGS $[filter-out -I%,$[cflags]] #define GTK_CFLAGS $[filter-out -I%,$[cflags]]
#define GTKMM_IPATH $[unique $[patsubst -I%,%,$[filter -I%,$[cflags]]]] #define GTK_IPATH $[unique $[patsubst -I%,%,$[filter -I%,$[cflags]]]]
#define GTKMM_LPATH $[unique $[patsubst -L%,%,$[filter -L%,$[libs]]]] #define GTK_LPATH $[unique $[patsubst -L%,%,$[filter -L%,$[libs]]]]
#define GTKMM_LIBS $[patsubst -l%,%,$[filter -l%,$[libs]]] #define GTK_LIBS $[patsubst -l%,%,$[filter -l%,$[libs]]]
#endif #endif
#if $[and $[HAVE_FREETYPE],$[FREETYPE_CONFIG]] #if $[and $[HAVE_FREETYPE],$[FREETYPE_CONFIG]]

10
dtool/pptempl/Global.pp
View File

@ -258,11 +258,11 @@
#define mikmod_libs $[MIKMOD_LIBS] #define mikmod_libs $[MIKMOD_LIBS]
#endif #endif
#if $[HAVE_GTKMM] #if $[HAVE_GTK]
#define gtkmm_ipath $[wildcard $[GTKMM_IPATH]] #define gtk_ipath $[wildcard $[GTK_IPATH]]
#define gtkmm_lpath $[wildcard $[GTKMM_LPATH]] #define gtk_lpath $[wildcard $[GTK_LPATH]]
#define gtkmm_cflags $[GTKMM_CFLAGS] #define gtk_cflags $[GTK_CFLAGS]
#define gtkmm_libs $[GTKMM_LIBS] #define gtk_libs $[GTK_LIBS]
#endif #endif
#if $[HAVE_FREETYPE] #if $[HAVE_FREETYPE]