Changeset 874

Timestamp:

06/26/07 08:37:08 (2 years ago)

Author:

timdewhirst

Message:

jahwidgets
- enforce use of pkg-config for olibs as the fallbacks resulted in
missing symbol problems

Files:

• trunk/jahwidgets/src/qt3/olibs.pri (modified) (1 diff)

trunk/jahwidgets/src/qt3/olibs.pri

@@ -2 +2 @@
 
 unix {
-    OLIB_PREFIX=$$system(pkg-config --variable=prefix openlibaries 2>/dev/null)
-    isEmpty( OLIB_PREFIX ) {
-        OLIB_PREFIX=/usr/local
-    }
-
-        # try the more aggressive flags (they may be unsupported on old versions of pkg-config?)
-        # note: there is also the --cflags-only-other (and the plain --cflags) available.
         OLIB_INCLUDE = $$system(pkg-config --cflags-only-I openlibraries 2>/dev/null | sed 's/-I//g')
         isEmpty( OLIB_INCLUDE ) {
-        # LATER: this may need fixing when the openlibraries include more values than just directories to be included
-                OLIB_INCLUDE = $$system(pkg-config --cflags openlibraries 2>/dev/null | sed 's/-I//g')
+                error( "pkg-config failed for some reason; check PKG_CONFIG_PATH is set" )
         }
-    isEmpty( OLIB_INCLUDE ) {
-        OLIB_INCLUDE=$$OLIB_PREFIX/include/openlibraries-0.4.1
-    }
 
-        # MAYBE: LATER: use --libs-only-l, --libs-only-L and/or --libs-only-other instead of --libs
         OLIB_LIBS = $$system(pkg-config --libs openlibraries 2>/dev/null)
-    isEmpty( OLIB_LIBS ) {
-        OLIB_LIBS=$$OLIB_PREFIX/lib/openlibraries-0.4.1
-    }
+        isEmpty( OLIB_LIBS ) {
+                error( "pkg-config failed for some reason; check PKG_CONFIG_PATH is set" )
+        }
 
-    INCLUDEPATH += $$OLIB_INCLUDE
-    LIBS         += $$OLIB_LIBS -L/usr/X11R6/lib
+        INCLUDEPATH += $$OLIB_INCLUDE
+        LIBS        += $$OLIB_LIBS -L/usr/X11R6/lib
 
-    # For now add any link flags from the environment
-    LIBS     += $(LDFLAGS)
+        # For now add any link flags from the environment
+        LIBS        += $(LDFLAGS)
 }
 
 # OPL auto links, but we need to give the path. NB requires quotes.
 win32 {
-    INCLUDEPATH   += C:/Boost/include/boost-1_33
+    INCLUDEPATH     += C:/Boost/include/boost-1_33
     LIBS            += -L"../openlibraries/src/openpluginlib/Multi-threaded Debug DLL"
     LIBS            += -L"../openlibraries/src/openimagelib/il/Multi-threaded Debug DLL"
     LIBS            += -L"../openlibraries/src/openmedialib/ml/Multi-threaded Debug DLL"
     LIBS            += -L"C:/boost/lib/"
-    LIBS            += -lGLEW32
+    LIBS            += -lGLEW32
 
     # OpenPluginLib requires these compiler settings.