[shaderz] r15 committed - Made changes to project file. Now links to a sdk folder just outside t...

[sha...@googlecode.com]

Revision: 15
Author: vijay.michaeljoseph
Date: Sat Jan 9 02:57:15 2010
Log: Made changes to project file. Now links to a sdk folder just outside
the shaderz folder.

Making an early commit to test the submission email.
http://code.google.com/p/shaderz/source/detail?r=15

Modified:
/trunk/Makefile
/trunk/shaderz.pro

=======================================
--- /trunk/Makefile Thu Jan 7 15:59:43 2010
+++ /trunk/Makefile Sat Jan 9 02:57:15 2010
@@ -1,6 +1,6 @@

#############################################################################
# Makefile for building: shaderz.app/Contents/MacOS/shaderz
-# Generated by qmake (2.01a) (Qt 4.5.3) on: Fri Jan 8 07:53:27 2010
+# Generated by qmake (2.01a) (Qt 4.5.3) on: Fri Jan 8 18:00:31 2010
# Project: shaderz.pro
# Template: app
# Command: /usr/bin/qmake -spec /usr/local/Qt4.5/mkspecs/macx-g++ -macx -o
Makefile shaderz.pro
@@ -13,10 +13,10 @@
DEFINES = -DUSE_QT4 -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
-DQT_SHARED
CFLAGS = -pipe -g -gdwarf-2 -arch i386 -Wall -W $(DEFINES)
CXXFLAGS = -pipe -isysroot /Developer/SDKs/MacOSX10.5.sdk
-mmacosx-version-min=10.5 -mmacosx-version-min=10.5 -Wl,
-headerpad_max_install_names -g -gdwarf-2 -arch i386 -Wall -W $(DEFINES)
-INCPATH = -I/usr/local/Qt4.5/mkspecs/macx-g++ -I.
-I/Library/Frameworks/QtCore.framework/Versions/4/Headers
-I/usr/include/QtCore
-I/Library/Frameworks/QtGui.framework/Versions/4/Headers
-I/usr/include/QtGui
-I/Library/Frameworks/QtOpenGL.framework/Versions/4/Headers
-I/usr/include/QtOpenGL -I/usr/include -I../OpenSceneGraph/include
-Iinclude -I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers
-I/System/Library/Frameworks/AGL.framework/Headers -I. -I.
-F/Library/Frameworks
+INCPATH = -I/usr/local/Qt4.5/mkspecs/macx-g++ -I.
-I/Library/Frameworks/QtCore.framework/Versions/4/Headers
-I/usr/include/QtCore
-I/Library/Frameworks/QtGui.framework/Versions/4/Headers
-I/usr/include/QtGui
-I/Library/Frameworks/QtOpenGL.framework/Versions/4/Headers
-I/usr/include/QtOpenGL -I/usr/include -I../sdks/include -Iinclude
-I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers
-I/System/Library/Frameworks/AGL.framework/Headers -I. -I.
-F/Library/Frameworks
LINK = g++
LFLAGS = -headerpad_max_install_names -arch i386
-LIBS = $(SUBLIBS) -F/Library/Frameworks
-L/Library/Frameworks ../OpenSceneGraph/lib/libOpenThreads.2.4.0.dylib ../OpenSceneGraph/lib/libosg.2.8.2.dylib ../OpenSceneGraph/lib/libosgDB.2.8.2.dylib ../OpenSceneGraph/lib/libosgUtil.2.8.2.dylib ../OpenSceneGraph/lib/libosgGA.2.8.2.dylib ../OpenSceneGraph/lib/libosgViewer.2.8.2.dylib ../OpenSceneGraph/lib/libosgText.2.8.2.dylib
-lpthread /usr/lib/libm.dylib -framework QtOpenGL -framework QtGui
-framework Carbon -framework AppKit -framework QtCore -lz -lm -framework
ApplicationServices -framework OpenGL -framework AGL
+LIBS = $(SUBLIBS) -F/Library/Frameworks
-L/Library/Frameworks ../sdks/lib/libOpenThreads.2.4.0.dylib ../sdks/lib/libosg.2.8.2.dylib ../sdks/lib/libosgDB.2.8.2.dylib ../sdks/lib/libosgUtil.2.8.2.dylib ../sdks/lib/libosgGA.2.8.2.dylib ../sdks/lib/libosgViewer.2.8.2.dylib ../sdks/lib/libosgText.2.8.2.dylib
-lpthread /usr/lib/libm.dylib -framework QtOpenGL -framework QtGui
-framework Carbon -framework AppKit -framework QtCore -lz -lm -framework
ApplicationServices -framework OpenGL -framework AGL
AR = ar cq
RANLIB = ranlib -s
QMAKE = /usr/bin/qmake
=======================================
--- /trunk/shaderz.pro Thu Jan 7 15:59:43 2010
+++ /trunk/shaderz.pro Sat Jan 9 02:57:15 2010
@@ -4,7 +4,7 @@
# Vijay Michael Joseph: Modified for cross platform includes and libs -
06-01-2010 (DD-MM-YYYY)
macx {
message("Platform = mac")
- INCLUDEPATH = ../OpenSceneGraph/include \
+ INCLUDEPATH = ../sdks/include \
./include
QMAKE_CXXFLAGS += -isysroot \
/Developer/SDKs/MacOSX10.5.sdk \
@@ -12,39 +12,33 @@
-mmacosx-version-min=10.5 \
-Wl, \
-headerpad_max_install_names
- LIBS += ../OpenSceneGraph/lib/libOpenThreads.2.4.0.dylib \
- ../OpenSceneGraph/lib/libosg.2.8.2.dylib \
- ../OpenSceneGraph/lib/libosgDB.2.8.2.dylib \
- ../OpenSceneGraph/lib/libosgUtil.2.8.2.dylib \
- ../OpenSceneGraph/lib/libosgGA.2.8.2.dylib \
- ../OpenSceneGraph/lib/libosgViewer.2.8.2.dylib \
- ../OpenSceneGraph/lib/libosgText.2.8.2.dylib \
- -framework \
- QtCore \
- -framework \
- QtGui \
- -framework \
- QtOpenGL \
+ LIBS += ../sdks/lib/libOpenThreads.2.4.0.dylib \
+ ../sdks/lib/libosg.2.8.2.dylib \
+ ../sdks/lib/libosgDB.2.8.2.dylib \
+ ../sdks/lib/libosgUtil.2.8.2.dylib \
+ ../sdks/lib/libosgGA.2.8.2.dylib \
+ ../sdks/lib/libosgViewer.2.8.2.dylib \
+ ../sdks/lib/libosgText.2.8.2.dylib \
+ -framework QtCore \
+ -framework QtGui \
+ -framework QtOpenGL \
-lpthread \
/usr/lib/libm.dylib \
- -framework \
- Carbon \
- -framework \
- AGL \
- -framework \
- OpenGL
+ -framework Carbon \
+ -framework AGL \
+ -framework OpenGL
}
else win32 {
message("Platform = win32")
- INCLUDEPATH = ../OpenSceneGraph/include \
+ INCLUDEPATH = ../sdks/include \
./include
- LIBS += ../OpenSceneGraph/lib/OpenThreads.lib \
- ../OpenSceneGraph/lib/osg.lib \
- ../OpenSceneGraph/lib/osgDB.lib \
- ../OpenSceneGraph/lib/osgUtil.lib \
- ../OpenSceneGraph/lib/osgGA.lib \
- ../OpenSceneGraph/lib/osgViewer.lib \
- ../OpenSceneGraph/lib/osgText.lib
+ LIBS += ../sdks/lib/OpenThreads.lib \
+ ../sdks/lib/osg.lib \
+ ../sdks/lib/osgDB.lib \
+ ../sdks/lib/osgUtil.lib \
+ ../sdks/lib/osgGA.lib \
+ ../sdks/lib/osgViewer.lib \
+ ../sdks/lib/osgText.lib
}
DEFINES += USE_QT4
QT += opengl