[libvidcap-commit] SF.net SVN: libvidcap: [51] trunk/examples/vidcapTester/vidcapTester.pro

[libvidcap c. m. <lib...@li...>]

Revision: 51
          http://libvidcap.svn.sourceforge.net/libvidcap/?rev=51&view=rev
Author:   bcholew
Date:     2007-10-18 06:45:53 -0700 (Thu, 18 Oct 2007)

Log Message:
-----------
Windows builds: look for libvidcap.lib in new place. All builds: if qmake is run with an added 'CONFIG+=special_config', look for libvidcap.lib in an entirely different place.

Modified Paths:
--------------
    trunk/examples/vidcapTester/vidcapTester.pro

Modified: trunk/examples/vidcapTester/vidcapTester.pro
===================================================================
--- trunk/examples/vidcapTester/vidcapTester.pro	2007-10-18 13:35:39 UTC (rev 50)
+++ trunk/examples/vidcapTester/vidcapTester.pro	2007-10-18 13:45:53 UTC (rev 51)
@@ -17,7 +17,12 @@
 
 unix:{
 	INCLUDEPATH += ../../include
-	local_lib_path = ../../../local-$$platform/lib
+	CONFIG(special_config): {
+		local_lib_path = ../../../local-$$platform/lib
+	}
+	else {
+		local_lib_path = ../../src/.libs
+	}
 	LIBS += $$local_lib_path/libvidcap.a
 }
 
@@ -40,7 +45,12 @@
 	INCLUDEPATH += ../../include
 
 	LIBS += -L\"$(PSDK_DIR)/Lib\"
-	LIBS += -L../../../build-win32/libvidcap/$$config_name
+	CONFIG(special_config): {
+		LIBS += -L../../../build-win32/libvidcap/$$config_name
+	}
+	else {
+		LIBS += -L../../contrib/win/vs2005/$$config_name/libvidcap
+	}
 
 	LIBS += strmiids.lib
 	LIBS += comsuppw.lib
@@ -71,7 +81,12 @@
 	   vidcapTester.cpp \
 
 unix:{
-	build_dir = ../../../build-$$platform/$$TARGET
+	CONFIG(special_config): {
+		build_dir = ../../../build-$$platform/$$TARGET
+	}
+	else {
+		build_dir = ../../build/$$TARGET
+	}
 
 	DESTDIR = $$build_dir
 	MOC_DIR = $$build_dir


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.