Browse Source

Use the glib from the gladewin32 package for cross-MinGW builds because kde-windows no longer provides one:
* add /target/lib/pkgconfig to the PKG_CONFIG_PATH
* remove the glib prefix hack


git-svn-id: file:///var/svn/tigccpp/trunk@1183 9552661e-59e3-4036-b4f2-dbe53926924f

kevinkofler 17 years ago
parent
commit
2de97b09b5
2 changed files with 1 additions and 8 deletions
  1. 0 7
      ktigcc/ktigcc.pro
  2. 1 1
      ktigcc/mingw/cross-mingw32-ktigcc.sh

+ 0 - 7
ktigcc/ktigcc.pro

@@ -157,13 +157,6 @@ HAVE_TICALCS = $$system(pkg-config --atleast-version=$$TICALCS_MINVERSION ticalc
 PKGCONFIG_CFLAGS += $$system(pkg-config --cflags ticalcs2)
 LIBS += $$system(pkg-config --libs ticalcs2)
 
-win32 {
-  # Hack out hardcoded prefix from the glib2 binary package's pkg-config file.
-  HARDCODED_GLIB_PREFIX = $$system(pkg-config --variable=prefix glib-2.0)
-  PKGCONFIG_CFLAGS ~= s!$$HARDCODED_GLIB_PREFIX!$$KDEPREFIX!g
-  LIBS ~= s!$$HARDCODED_GLIB_PREFIX!$$KDEPREFIX!g
-}
-
 TIGCC = $$(TIGCC)
 isEmpty(TIGCC) {
   TIGCC = /usr/local/tigcc

+ 1 - 1
ktigcc/mingw/cross-mingw32-ktigcc.sh

@@ -7,5 +7,5 @@ export KDEPREFIX=~/.wine/c/kde4
 TIEMUPREFIX=~/.wine/c/tiemu
 #export C_INCLUDE_PATH=$KDEPREFIX/include:$TIEMUPREFIX/include:/usr/local/i386-mingw32/include
 #export LIBRARY_PATH=$KDEPREFIX/lib:$TIEMUPREFIX/lib:/usr/local/i386-mingw32/lib/w32api:/usr/local/i386-mingw32/lib
-export PKG_CONFIG_PATH=/usr/local/i386-mingw32/lib/pkgconfig:$KDEPREFIX/lib/pkgconfig:$TIEMUPREFIX/lib/pkgconfig
+export PKG_CONFIG_PATH=/usr/local/i386-mingw32/lib/pkgconfig:$KDEPREFIX/lib/pkgconfig:$TIEMUPREFIX/lib/pkgconfig:/target/lib/pkgconfig
 export QMAKESPEC=win32-cross-g++