hdrflow-svn Mailing List for HDRFlow (Page 13)
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
hdrflow-svn — HDRFlow SVN notifications
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(30) |
May
(38) |
Jun
(22) |
Jul
(53) |
Aug
(66) |
Sep
(56) |
Oct
(29) |
Nov
(13) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(16) |
Feb
(22) |
Mar
(12) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gl...@us...> - 2007-06-24 20:49:07
|
Revision: 162
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=162&view=rev
Author: glslang
Date: 2007-06-24 13:49:00 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
+fix comparison so it doesn't repeat plugins
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-06-24 19:43:26 UTC (rev 161)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-06-24 20:49:00 UTC (rev 162)
@@ -1,6 +1,4 @@
-// openpluginlib - A plugin interface to openlibraries.
-
// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
@@ -146,7 +144,7 @@
: public std::binary_function<detail::discover_query_impl::plugin_proxy, detail::discover_query_impl::plugin_proxy, bool>
{
bool operator( )( const detail::discover_query_impl::plugin_proxy& x, const detail::discover_query_impl::plugin_proxy& y ) const
- { return x.merit( ) > y.merit( ); }
+ { return !( x.merit( ) < y.merit( ) ) && x.name( ) < y.name( ) && x.type( ) < y.type( ); }
};
} }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-24 19:43:27
|
Revision: 161
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=161&view=rev
Author: glslang
Date: 2007-06-24 12:43:26 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
+ plugins were being added twice on windows
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/opl_parser_action.cpp
trunk/lib/openlibraries/test/openpluginlib/enumerate/enumerate.cpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/opl_parser_action.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/opl_parser_action.cpp 2007-06-24 18:20:51 UTC (rev 160)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/opl_parser_action.cpp 2007-06-24 19:43:26 UTC (rev 161)
@@ -92,10 +92,6 @@
fs::path tmp( to_string( *I ).c_str( ), fs::native );
filename.push_back( to_wstring( ( pa.get_branch_path( ) / tmp.leaf( ) ).string( ).c_str( ) ) );
-
-# ifdef WIN32
- filename.push_back( to_wstring( ( fs::path( opl::plugins_path( ).c_str( ), fs::native ) / tmp.leaf( ) ).string( ).c_str( ) ) );
-# endif
}
}
}
Modified: trunk/lib/openlibraries/test/openpluginlib/enumerate/enumerate.cpp
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/enumerate/enumerate.cpp 2007-06-24 18:20:51 UTC (rev 160)
+++ trunk/lib/openlibraries/test/openpluginlib/enumerate/enumerate.cpp 2007-06-24 19:43:26 UTC (rev 161)
@@ -18,7 +18,6 @@
opl::init( "" );
opl::discovery<> rez0;
- rez0.sort( opl::highest_merit_sort( ) );
std::cout << "enumerate: number of plugins available " << static_cast<unsigned int>( rez0.size( ) ) << ".\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-24 18:20:52
|
Revision: 160
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=160&view=rev
Author: glslang
Date: 2007-06-24 11:20:51 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
+distibution script fixes and updates
Modified Paths:
--------------
trunk/HDRFlow.pmproj
trunk/HDRFlowFramework.pmproj
trunk/app/HDRFlow/English.lproj/InfoPlist.strings
trunk/app/HDRFlow/Info.plist
trunk/unity.sh
Added Paths:
-----------
trunk/HDRFlowApp.pmproj
Modified: trunk/HDRFlow.pmproj
===================================================================
(Binary files differ)
Added: trunk/HDRFlowApp.pmproj
===================================================================
(Binary files differ)
Property changes on: trunk/HDRFlowApp.pmproj
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/HDRFlowFramework.pmproj
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/Info.plist
===================================================================
--- trunk/app/HDRFlow/Info.plist 2007-06-24 16:43:23 UTC (rev 159)
+++ trunk/app/HDRFlow/Info.plist 2007-06-24 18:20:51 UTC (rev 160)
@@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>com.yourcompany.HDRFlow</string>
+ <string>com.cryogenicgraphics.hdrflow</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
- <string>????</string>
+ <string>HDRF</string>
<key>CFBundleVersion</key>
- <string>1.0</string>
+ <string>0.1.0</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-06-24 16:43:23 UTC (rev 159)
+++ trunk/unity.sh 2007-06-24 18:20:51 UTC (rev 160)
@@ -333,6 +333,11 @@
echo "not implemented"
}
+make_app( )
+{
+ cp -R ./app/HDRFlow/build/Release/HDRFlow.app .
+}
+
make_pkg_installer( )
{
/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -proj HDRFlowFramework.pmproj -p HDRFlowFramework.pkg
@@ -354,14 +359,18 @@
then echo " Building Umbrella Framework..."
echo -n " HDRFlow..."
make_umbrella_framework
- check_status $?
-
- if [ "$build_installer -eq 1 ]
- then echo " Building packages..."
- make_pkg_installer
- check_status $?
- fi
+ check_status $?
fi
+
+ echo -n " HDRFlow application..."
+ make_app
+ check_status $?
+
+ if [ "$build_installer" -eq 1 ]
+ then echo " Building packages..."
+ make_pkg_installer
+ check_status $?
+ fi
fi
exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-24 16:43:25
|
Revision: 159
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=159&view=rev
Author: glslang
Date: 2007-06-24 09:43:23 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
+ Menu corrections
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-06-24 15:31:51 UTC (rev 158)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-06-24 16:43:23 UTC (rev 159)
@@ -7,7 +7,7 @@
<key>IBEditorPositions</key>
<dict>
<key>29</key>
- <string>109 299 338 44 0 0 1440 878 </string>
+ <string>109 299 290 44 0 0 1440 878 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-24 15:31:55
|
Revision: 158
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=158&view=rev
Author: glslang
Date: 2007-06-24 08:31:51 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
+ Cocoa OpenGL initialisation
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/app/HDRFlow/CustomOpenGLView.h
trunk/app/HDRFlow/CustomOpenGLView.m
trunk/app/HDRFlow/ViewportOpenGLView.h
trunk/app/HDRFlow/ViewportOpenGLView.m
Added: trunk/app/HDRFlow/CustomOpenGLView.h
===================================================================
--- trunk/app/HDRFlow/CustomOpenGLView.h (rev 0)
+++ trunk/app/HDRFlow/CustomOpenGLView.h 2007-06-24 15:31:51 UTC (rev 158)
@@ -0,0 +1,33 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import <Cocoa/Cocoa.h>
+
+@class NSOpenGLContext, NSOpenGLPixelFormat;
+
+@interface CustomOpenGLView : NSView
+{
+@private
+ NSOpenGLContext* context_;
+ NSOpenGLPixelFormat* pixelFormat_;
+}
+
++ ( NSOpenGLPixelFormat* ) defaultPixelFormat;
+
+- ( id ) initWithFrame: ( NSRect ) frameRect pixelFormat: ( NSOpenGLPixelFormat* ) format;
+
+- ( void ) setOpenGLContext: ( NSOpenGLContext* ) context;
+- ( NSOpenGLContext* ) openGLContext;
+- ( void ) clearGLContext;
+- ( void ) prepareOpenGL;
+
+- ( void ) update;
+
+- ( void ) setPixelFormat: ( NSOpenGLPixelFormat* ) format;
+- ( NSOpenGLPixelFormat* ) pixelFormat;
+
+@end
Added: trunk/app/HDRFlow/CustomOpenGLView.m
===================================================================
--- trunk/app/HDRFlow/CustomOpenGLView.m (rev 0)
+++ trunk/app/HDRFlow/CustomOpenGLView.m 2007-06-24 15:31:51 UTC (rev 158)
@@ -0,0 +1,143 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import <OpenGL/OpenGL.h>
+#import <OpenGL/gl.h>
+
+#import "CustomOpenGLView.h"
+
+@implementation CustomOpenGLView
+
++ ( NSOpenGLPixelFormat* ) defaultPixelFormat
+{
+ NSOpenGLPixelFormatAttribute attribs[ ] = { 0 };
+ return [ [ ( NSOpenGLPixelFormat* ) [ NSOpenGLPixelFormat alloc ] initWithAttributes: attribs ] autorelease ];
+}
+
+- ( id ) initWithFrame: ( NSRect ) frameRect pixelFormat: ( NSOpenGLPixelFormat* ) format
+{
+ self = [ super initWithFrame: frameRect ];
+ if( self != nil )
+ pixelFormat_ = [ format retain ];
+ [ [ NSNotificationCenter defaultCenter ] addObserver: self selector: @selector( _surfaceNeedsUpdate: ) name: NSViewGlobalFrameDidChangeNotification object: self ];
+ return self;
+}
+
+- ( void ) dealloc
+{
+ [ [ NSNotificationCenter defaultCenter ] removeObserver: self name: NSViewGlobalFrameDidChangeNotification object: self ];
+ [ self clearGLContext ];
+ [ pixelFormat_ release ];
+
+ [ super dealloc ];
+}
+
+- ( void ) setOpenGLContext: ( NSOpenGLContext* ) context
+{
+ [ self clearGLContext ];
+ context_ = [ context retain ];
+}
+
+- ( NSOpenGLContext* ) openGLContext
+{
+ if( context_ == NULL )
+ {
+ context_ = [ [ NSOpenGLContext alloc ] initWithFormat: pixelFormat_ != nil ? pixelFormat_ : [ [ self class ] defaultPixelFormat ] shareContext: nil ];
+ [ context_ makeCurrentContext ];
+ [ self prepareOpenGL ];
+ }
+
+ return context_;
+}
+
+- ( void ) clearGLContext
+{
+ if( context_ != nil )
+ {
+ if( [ context_ view ] == self )
+ [ context_ clearDrawable ];
+
+ [ context_ release ];
+ context_ = nil;
+ }
+}
+
+- ( void ) prepareOpenGL
+{
+}
+
+- ( BOOL ) isOpaque
+{
+ return YES;
+}
+
+- ( void ) setPixelFormat: ( NSOpenGLPixelFormat* ) pixelFormat
+{
+ [ pixelFormat_ release ];
+ pixelFormat_ = [ pixelFormat retain ];
+}
+
+- ( NSOpenGLPixelFormat* ) pixelFormat
+{
+ return pixelFormat_;
+}
+
+- ( void ) lockFocus
+{
+ NSOpenGLContext* context = [ self openGLContext ];
+
+ [ super lockFocus ];
+
+ if( [ context view ] != self )
+ [ context setView: self ];
+
+ [ context makeCurrentContext ];
+}
+
+- ( void ) update
+{
+ if( [ context_ view ] == self )
+ [ context_ update ];
+}
+
+- ( void ) _surfaceNeedsUpdate: ( NSNotification* ) notification
+{
+ [ self update ];
+}
+
+- ( void ) encodeWithCoder: ( NSCoder* ) coder
+{
+ [ super encodeWithCoder: coder ];
+ if( ![ coder allowsKeyedCoding ] )
+ {
+ [ coder encodeValuesOfObjCTypes: "@iii", &pixelFormat_ ];
+ }
+ else
+ {
+ [ coder encodeObject: pixelFormat_ forKey: @"NSPixelFormat" ];
+ }
+}
+
+- ( id ) initWithCoder: ( NSCoder* ) coder
+{
+ self = [ super initWithCoder: coder ];
+
+ if( ![ coder allowsKeyedCoding ] )
+ {
+ [ coder decodeValuesOfObjCTypes: "@iii", &pixelFormat_ ];
+ }
+ else
+ {
+ pixelFormat_ = [ [ coder decodeObjectForKey: @"NSPixelFormat" ] retain ];
+ }
+
+ [ [ NSNotificationCenter defaultCenter ] addObserver: self selector: @selector( _surfaceNeedsUpdate: ) name: NSViewGlobalFrameDidChangeNotification object: self ];
+
+ return self;
+}
+
+@end
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib 2007-06-23 20:31:49 UTC (rev 157)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib 2007-06-24 15:31:51 UTC (rev 158)
@@ -1,4 +1,8 @@
{
- IBClasses = ({CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; });
+ IBClasses = (
+ {CLASS = CustomOpenGLView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
+ {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
+ {CLASS = ViewportOpenGLView; LANGUAGE = ObjC; SUPERCLASS = CustomOpenGLView; }
+ );
IBVersion = 1;
}
\ No newline at end of file
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-06-23 20:31:49 UTC (rev 157)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-06-24 15:31:51 UTC (rev 158)
@@ -3,20 +3,20 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>94 103 356 240 0 0 1280 1002 </string>
+ <string>472 85 356 240 0 0 1440 878 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
- <string>93 343 318 44 0 0 1280 1002 </string>
+ <string>109 299 338 44 0 0 1440 878 </string>
</dict>
<key>IBFramework Version</key>
- <string>401.0</string>
+ <string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>21</integer>
<integer>29</integer>
- <integer>21</integer>
</array>
<key>IBSystem Version</key>
- <string>8A259</string>
+ <string>8R2218</string>
</dict>
</plist>
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-06-23 20:31:49 UTC (rev 157)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-06-24 15:31:51 UTC (rev 158)
@@ -7,6 +7,9 @@
objects = {
/* Begin PBXBuildFile section */
+ 678A4AA70C2B18B50011E9F7 /* CustomOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */; };
+ 67DC61B90C2EAC94005CFE6E /* ViewportOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 67DC61B80C2EAC94005CFE6E /* ViewportOpenGLView.m */; };
+ 67DC62180C2EC0D9005CFE6E /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67DC62170C2EC0D9005CFE6E /* OpenGL.framework */; };
8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
@@ -22,6 +25,11 @@
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
32CA4F630368D1EE00C91783 /* HDRFlow_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDRFlow_Prefix.pch; sourceTree = "<group>"; };
+ 678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CustomOpenGLView.m; sourceTree = "<group>"; };
+ 67DC61B10C2EAB5E005CFE6E /* ViewportOpenGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewportOpenGLView.h; sourceTree = "<group>"; };
+ 67DC61B80C2EAC94005CFE6E /* ViewportOpenGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewportOpenGLView.m; sourceTree = "<group>"; };
+ 67DC62170C2EC0D9005CFE6E /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
+ 67F6CCF70C285D6C00098F90 /* CustomOpenGLView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CustomOpenGLView.h; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* HDRFlow.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HDRFlow.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@@ -32,6 +40,7 @@
buildActionMask = 2147483647;
files = (
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
+ 67DC62180C2EC0D9005CFE6E /* OpenGL.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -41,6 +50,10 @@
080E96DDFE201D6D7F000001 /* Classes */ = {
isa = PBXGroup;
children = (
+ 67F6CCF70C285D6C00098F90 /* CustomOpenGLView.h */,
+ 678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */,
+ 67DC61B10C2EAB5E005CFE6E /* ViewportOpenGLView.h */,
+ 67DC61B80C2EAC94005CFE6E /* ViewportOpenGLView.m */,
);
name = Classes;
sourceTree = "<group>";
@@ -48,6 +61,7 @@
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
isa = PBXGroup;
children = (
+ 67DC62170C2EC0D9005CFE6E /* OpenGL.framework */,
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
);
name = "Linked Frameworks";
@@ -165,6 +179,8 @@
buildActionMask = 2147483647;
files = (
8D11072D0486CEB800E47090 /* main.m in Sources */,
+ 678A4AA70C2B18B50011E9F7 /* CustomOpenGLView.m in Sources */,
+ 67DC61B90C2EAC94005CFE6E /* ViewportOpenGLView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Added: trunk/app/HDRFlow/ViewportOpenGLView.h
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.h (rev 0)
+++ trunk/app/HDRFlow/ViewportOpenGLView.h 2007-06-24 15:31:51 UTC (rev 158)
@@ -0,0 +1,21 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import "CustomOpenGLView.h"
+
+@interface ViewportOpenGLView : CustomOpenGLView
+{
+}
+
++ ( NSOpenGLPixelFormat* ) pixelFormat;
+
+- ( id ) initWithFrame: ( NSRect ) theFrame;
+- ( void ) dealloc;
+- ( void ) drawRect: ( NSRect ) theRect;
+- ( void ) update;
+
+@end
Added: trunk/app/HDRFlow/ViewportOpenGLView.m
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.m (rev 0)
+++ trunk/app/HDRFlow/ViewportOpenGLView.m 2007-06-24 15:31:51 UTC (rev 158)
@@ -0,0 +1,78 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import <OpenGL/OpenGL.h>
+#import <OpenGL/gl.h>
+
+#import "ViewportOpenGLView.h"
+
+@implementation ViewportOpenGLView
+
++ ( NSOpenGLPixelFormat* ) pixelFormat
+{
+ NSOpenGLPixelFormatAttribute attribs[ ] =
+ {
+ NSOpenGLPFAWindow,
+ NSOpenGLPFADoubleBuffer,
+ NSOpenGLPFADepthSize, 24,
+ NSOpenGLPFAStencilSize, 8,
+ 0
+ };
+
+ return [ [ [ NSOpenGLPixelFormat alloc ] initWithAttributes: attribs ] autorelease ];
+}
+
+- ( id ) initWithFrame: ( NSRect ) theFrame
+{
+ [ super initWithFrame: theFrame pixelFormat: [ self pixelFormat ] ];
+ [ [ super openGLContext ] makeCurrentContext ];
+
+ return self;
+}
+
+- ( void ) dealloc
+{
+ [ super dealloc ];
+}
+
+- ( void ) renewGState
+{
+ NSWindow* window;
+ [ super renewGState ];
+ window = [ self window ];
+
+ if( [ window respondsToSelector: @selector( disableScreenUpdatesUntilFlush ) ] )
+ [ window disableScreenUpdatesUntilFlush ];
+}
+
+- ( void ) drawRect: ( NSRect ) theRect
+{
+ NSRect bounds = [ self bounds ];
+
+ glViewport( 0, 0, NSWidth( bounds ), NSHeight( bounds ) );
+ glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
+
+ glFlush( );
+}
+
+- ( void ) prepareOpenGL
+{
+ glClearColor( 0.0, 0.0, 0.0, 0.0 );
+
+ // Sync to vertical retrace
+ long VBL = 1;
+ [ [ self openGLContext ] setValues: &VBL forParameter: NSOpenGLCPSwapInterval ];
+}
+
+- ( void ) update
+{
+ [ super update ];
+ if( ![ self inLiveResize ] )
+ ;
+}
+
+@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-23 20:31:50
|
Revision: 157
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=157&view=rev
Author: glslang
Date: 2007-06-23 13:31:49 -0700 (Sat, 23 Jun 2007)
Log Message:
-----------
+build updates
Added Paths:
-----------
trunk/HDRFlow.pmproj
Added: trunk/HDRFlow.pmproj
===================================================================
(Binary files differ)
Property changes on: trunk/HDRFlow.pmproj
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-22 12:12:26
|
Revision: 156
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=156&view=rev
Author: glslang
Date: 2007-06-22 05:11:54 -0700 (Fri, 22 Jun 2007)
Log Message:
-----------
+universal build updates
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/timer.hpp
trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/timer.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/timer.hpp 2007-06-22 10:19:40 UTC (rev 155)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/timer.hpp 2007-06-22 12:11:54 UTC (rev 156)
@@ -97,6 +97,7 @@
};
#endif
+#ifndef __ppc__
template<class time_value_policy, template<class> class sleep_policy>
class rdtsc : public time_value_policy, public sleep_policy<time_value_policy>
{
@@ -254,6 +255,7 @@
ticks_type stop_;
ticks_type ticks_per_microsec_;
};
+#endif
#ifndef WIN32
template<class time_value_policy, template<class> class sleep_policy>
@@ -330,8 +332,10 @@
#ifdef WIN32
typedef timer<rdtsc<time_value, event_sleep> > rdtsc_default_timer;
#else
-# if GCC_VERSION >= 40000 && !defined __ppc
+# if GCC_VERSION >= 40000 && !defined __ppc__
typedef timer<rdtsc<time_value, nanosleep_> > rdtsc_default_timer;
+# else
+ typedef timer<gettimeofday_<time_value, nanosleep_> > rdtsc_default_timer;
# endif
typedef timer<gettimeofday_<time_value, nanosleep_> > gettimeofday_default_timer;
#endif
Modified: trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am 2007-06-22 10:19:40 UTC (rev 155)
+++ trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am 2007-06-22 12:11:54 UTC (rev 156)
@@ -10,7 +10,8 @@
tm_bench_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ $(GLEW_INCLUDE_PATH)
tm_bench_LDFLAGS = \
$(OLIB_LDFLAGS) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-22 10:19:41
|
Revision: 155
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=155&view=rev
Author: glslang
Date: 2007-06-22 03:19:40 -0700 (Fri, 22 Jun 2007)
Log Message:
-----------
+ build update
Modified Paths:
--------------
trunk/unity.sh
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-06-17 08:29:21 UTC (rev 154)
+++ trunk/unity.sh 2007-06-22 10:19:40 UTC (rev 155)
@@ -19,7 +19,7 @@
if [ $# -eq "0" ]
then
- echo "usage: `basename $0` options (-evbfioxu)"
+ echo "usage: `basename $0` options (-evbfioxup)"
exit 1
fi
@@ -31,12 +31,13 @@
build_frameworks=0
build_umbrella=0
+build_installer=0
framework_version="A"
install_name_prefix="/Library/Frameworks"
output_directory="."
-while getopts "v:b:efi:o:x:u" option
+while getopts "v:b:efi:o:x:up" option
do
case $option in
e ) update_boost_version=1;;
@@ -47,6 +48,7 @@
o ) output_directory="$OPTARG";;
i ) install_name_prefix="$OPTARG";;
u ) build_umbrella=1;;
+ p ) build_installer=1;;
esac
done
@@ -326,18 +328,14 @@
find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''
}
-make_installer( )
+make_extras_framework( )
{
- TMP="/var/tmp"
- FMWK="/var/tmp/dstroot$$"
-
- mkdir -p $FMWK &&
- cp -R ./HDRFlow.framework $FMWK
+ echo "not implemented"
+}
- #/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -p $TMP/HDRFlowFramework.pkg \
- # -f $TMP/dstroot$$ -i $PWD/dist/$PLATFORM/core-Info.plist -d $PWD/dist/$PLATFORM/core-desc.plist -ds -v &&
-
- rm -rf $FMWK
+make_pkg_installer( )
+{
+ /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -proj HDRFlowFramework.pmproj -p HDRFlowFramework.pkg
}
if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ]
@@ -357,6 +355,12 @@
echo -n " HDRFlow..."
make_umbrella_framework
check_status $?
+
+ if [ "$build_installer -eq 1 ]
+ then echo " Building packages..."
+ make_pkg_installer
+ check_status $?
+ fi
fi
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-17 08:29:26
|
Revision: 154
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=154&view=rev
Author: glslang
Date: 2007-06-17 01:29:21 -0700 (Sun, 17 Jun 2007)
Log Message:
-----------
+ initial stream abstraction
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
Added Paths:
-----------
trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-06-16 22:00:18 UTC (rev 153)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-06-17 08:29:21 UTC (rev 154)
@@ -261,6 +261,10 @@
>
</File>
<File
+ RelativePath=".\stream.cpp"
+ >
+ </File>
+ <File
RelativePath=".\pcos\subject.cpp"
>
</File>
@@ -399,6 +403,10 @@
>
</File>
<File
+ RelativePath=".\stream.hpp"
+ >
+ </File>
+ <File
RelativePath=".\string.hpp"
>
</File>
Added: trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp (rev 0)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp 2007-06-17 08:29:21 UTC (rev 154)
@@ -0,0 +1,17 @@
+
+// openpluginlib - A plugin interface to openlibraries.
+
+// Copyright (C) 2007 Goncalo Nuno M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.openlibraries.org.
+
+#include <openpluginlib/pl/stream.hpp>
+
+namespace olib { namespace openpluginlib {
+
+stream_ptr make_stream( const string&, int )
+{
+ return stream_ptr( );
+}
+
+} }
Added: trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp (rev 0)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp 2007-06-17 08:29:21 UTC (rev 154)
@@ -0,0 +1,60 @@
+
+// openpluginlib - A plugin interface to openlibraries.
+
+// Copyright (C) 2007 Goncalo Nuno M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.openlibraries.org.
+
+#ifndef STREAM_INC_
+#define STREAM_INC_
+
+#include <boost/shared_ptr.hpp>
+
+#include <openpluginlib/pl/config.hpp>
+#include <openpluginlib/pl/string.hpp>
+
+namespace olib { namespace openpluginlib {
+
+class OPENPLUGINLIB_DECLSPEC stream
+{
+public:
+ typedef char value_type;
+ typedef value_type* pointer;
+ typedef const value_type* const_pointer;
+
+public:
+ static const int in_stream = 1;
+ static const int out_stream = 2;
+ static const int binary_stream = 4;
+
+public:
+ explicit stream( pointer data = 0, int flags = in_stream | out_stream | binary_stream )
+ : data_( data )
+ , flags_( flags )
+ { }
+
+ int read( pointer, int );
+ int write( const_pointer, int );
+ long seek( long, int );
+
+ int flags( ) const;
+ bool is_thread_safe( ) const;
+ bool is_null( ) const { return data_ == ( pointer ) 0; }
+
+private:
+ stream( const stream& );
+ stream& operator=( const stream& );
+
+private:
+ pointer data_;
+ int flags_;
+};
+
+typedef boost::shared_ptr<stream> stream_ptr;
+
+stream_ptr make_stream( const string& path, int flags );
+stream_ptr make_stream( void* data, int flags );
+
+} }
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-16 22:00:20
|
Revision: 153
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=153&view=rev
Author: glslang
Date: 2007-06-16 15:00:18 -0700 (Sat, 16 Jun 2007)
Log Message:
-----------
+ os/x package maker project
Modified Paths:
--------------
trunk/unity.sh
Added Paths:
-----------
trunk/HDRFlowFramework.pmproj
Added: trunk/HDRFlowFramework.pmproj
===================================================================
(Binary files differ)
Property changes on: trunk/HDRFlowFramework.pmproj
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-06-15 21:39:08 UTC (rev 152)
+++ trunk/unity.sh 2007-06-16 22:00:18 UTC (rev 153)
@@ -326,6 +326,20 @@
find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''
}
+make_installer( )
+{
+ TMP="/var/tmp"
+ FMWK="/var/tmp/dstroot$$"
+
+ mkdir -p $FMWK &&
+ cp -R ./HDRFlow.framework $FMWK
+
+ #/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -p $TMP/HDRFlowFramework.pkg \
+ # -f $TMP/dstroot$$ -i $PWD/dist/$PLATFORM/core-Info.plist -d $PWD/dist/$PLATFORM/core-desc.plist -ds -v &&
+
+ rm -rf $FMWK
+}
+
if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ]
then
echo "Building OS/X Frameworks..."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-15 21:39:13
|
Revision: 152
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=152&view=rev
Author: glslang
Date: 2007-06-15 14:39:08 -0700 (Fri, 15 Jun 2007)
Log Message:
-----------
RTF license for pretty install
Modified Paths:
--------------
trunk/lib/openlibraries/COPYING
Added Paths:
-----------
trunk/lib/openlibraries/COPYING.rtf
Modified: trunk/lib/openlibraries/COPYING
===================================================================
--- trunk/lib/openlibraries/COPYING 2007-06-14 20:34:49 UTC (rev 151)
+++ trunk/lib/openlibraries/COPYING 2007-06-15 21:39:08 UTC (rev 152)
@@ -456,50 +456,4 @@
DAMAGES.
END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
-
+
\ No newline at end of file
Added: trunk/lib/openlibraries/COPYING.rtf
===================================================================
--- trunk/lib/openlibraries/COPYING.rtf (rev 0)
+++ trunk/lib/openlibraries/COPYING.rtf 2007-06-15 21:39:08 UTC (rev 152)
@@ -0,0 +1,462 @@
+{\rtf1\ansi\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}}
+{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\lang2057\f0\fs22\tab\tab GNU LESSER GENERAL PUBLIC LICENSE\par
+\tab\tab Version 2.1, February 1999\par
+\par
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.\par
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\par
+ Everyone is permitted to copy and distribute verbatim copies\par
+ of this license document, but changing it is not allowed.\par
+\par
+[This is the first released version of the Lesser GPL. It also counts\par
+ as the successor of the GNU Library Public License, version 2, hence\par
+ the version number 2.1.]\par
+\par
+\tab\tab\tab Preamble\par
+\par
+ The licenses for most software are designed to take away your\par
+freedom to share and change it. By contrast, the GNU General Public\par
+Licenses are intended to guarantee your freedom to share and change\par
+free software--to make sure the software is free for all its users.\par
+\par
+ This license, the Lesser General Public License, applies to some\par
+specially designated software packages--typically libraries--of the\par
+Free Software Foundation and other authors who decide to use it. You\par
+can use it too, but we suggest you first think carefully about whether\par
+this license or the ordinary General Public License is the better\par
+strategy to use in any particular case, based on the explanations below.\par
+\par
+ When we speak of free software, we are referring to freedom of use,\par
+not price. Our General Public Licenses are designed to make sure that\par
+you have the freedom to distribute copies of free software (and charge\par
+for this service if you wish); that you receive source code or can get\par
+it if you want it; that you can change the software and use pieces of\par
+it in new free programs; and that you are informed that you can do\par
+these things.\par
+\par
+ To protect your rights, we need to make restrictions that forbid\par
+distributors to deny you these rights or to ask you to surrender these\par
+rights. These restrictions translate to certain responsibilities for\par
+you if you distribute copies of the library or if you modify it.\par
+\par
+ For example, if you distribute copies of the library, whether gratis\par
+or for a fee, you must give the recipients all the rights that we gave\par
+you. You must make sure that they, too, receive or can get the source\par
+code. If you link other code with the library, you must provide\par
+complete object files to the recipients, so that they can relink them\par
+with the library after making changes to the library and recompiling\par
+it. And you must show them these terms so they know their rights.\par
+\par
+ We protect your rights with a two-step method: (1) we copyright the\par
+library, and (2) we offer you this license, which gives you legal\par
+permission to copy, distribute and/or modify the library.\par
+\par
+ To protect each distributor, we want to make it very clear that\par
+there is no warranty for the free library. Also, if the library is\par
+modified by someone else and passed on, the recipients should know\par
+that what they have is not the original version, so that the original\par
+author's reputation will not be affected by problems that might be\par
+introduced by others.\par
+\page\par
+ Finally, software patents pose a constant threat to the existence of\par
+any free program. We wish to make sure that a company cannot\par
+effectively restrict the users of a free program by obtaining a\par
+restrictive license from a patent holder. Therefore, we insist that\par
+any patent license obtained for a version of the library must be\par
+consistent with the full freedom of use specified in this license.\par
+\par
+ Most GNU software, including some libraries, is covered by the\par
+ordinary GNU General Public License. This license, the GNU Lesser\par
+General Public License, applies to certain designated libraries, and\par
+is quite different from the ordinary General Public License. We use\par
+this license for certain libraries in order to permit linking those\par
+libraries into non-free programs.\par
+\par
+ When a program is linked with a library, whether statically or using\par
+a shared library, the combination of the two is legally speaking a\par
+combined work, a derivative of the original library. The ordinary\par
+General Public License therefore permits such linking only if the\par
+entire combination fits its criteria of freedom. The Lesser General\par
+Public License permits more lax criteria for linking other code with\par
+the library.\par
+\par
+ We call this license the "Lesser" General Public License because it\par
+does Less to protect the user's freedom than the ordinary General\par
+Public License. It also provides other free software developers Less\par
+of an advantage over competing non-free programs. These disadvantages\par
+are the reason we use the ordinary General Public License for many\par
+libraries. However, the Lesser license provides advantages in certain\par
+special circumstances.\par
+\par
+ For example, on rare occasions, there may be a special need to\par
+encourage the widest possible use of a certain library, so that it becomes\par
+a de-facto standard. To achieve this, non-free programs must be\par
+allowed to use the library. A more frequent case is that a free\par
+library does the same job as widely used non-free libraries. In this\par
+case, there is little to gain by limiting the free library to free\par
+software only, so we use the Lesser General Public License.\par
+\par
+ In other cases, permission to use a particular library in non-free\par
+programs enables a greater number of people to use a large body of\par
+free software. For example, permission to use the GNU C Library in\par
+non-free programs enables many more people to use the whole GNU\par
+operating system, as well as its variant, the GNU/Linux operating\par
+system.\par
+\par
+ Although the Lesser General Public License is Less protective of the\par
+users' freedom, it does ensure that the user of a program that is\par
+linked with the Library has the freedom and the wherewithal to run\par
+that program using a modified version of the Library.\par
+\par
+ The precise terms and conditions for copying, distribution and\par
+modification follow. Pay close attention to the difference between a\par
+"work based on the library" and a "work that uses the library". The\par
+former contains code derived from the library, whereas the latter must\par
+be combined with the library in order to run.\par
+\page\par
+\tab\tab GNU LESSER GENERAL PUBLIC LICENSE\par
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\par
+\par
+ 0. This License Agreement applies to any software library or other\par
+program which contains a notice placed by the copyright holder or\par
+other authorized party saying it may be distributed under the terms of\par
+this Lesser General Public License (also called "this License").\par
+Each licensee is addressed as "you".\par
+\par
+ A "library" means a collection of software functions and/or data\par
+prepared so as to be conveniently linked with application programs\par
+(which use some of those functions and data) to form executables.\par
+\par
+ The "Library", below, refers to any such software library or work\par
+which has been distributed under these terms. A "work based on the\par
+Library" means either the Library or any derivative work under\par
+copyright law: that is to say, a work containing the Library or a\par
+portion of it, either verbatim or with modifications and/or translated\par
+straightforwardly into another language. (Hereinafter, translation is\par
+included without limitation in the term "modification".)\par
+\par
+ "Source code" for a work means the preferred form of the work for\par
+making modifications to it. For a library, complete source code means\par
+all the source code for all modules it contains, plus any associated\par
+interface definition files, plus the scripts used to control compilation\par
+and installation of the library.\par
+\par
+ Activities other than copying, distribution and modification are not\par
+covered by this License; they are outside its scope. The act of\par
+running a program using the Library is not restricted, and output from\par
+such a program is covered only if its contents constitute a work based\par
+on the Library (independent of the use of the Library in a tool for\par
+writing it). Whether that is true depends on what the Library does\par
+and what the program that uses the Library does.\par
+ \par
+ 1. You may copy and distribute verbatim copies of the Library's\par
+complete source code as you receive it, in any medium, provided that\par
+you conspicuously and appropriately publish on each copy an\par
+appropriate copyright notice and disclaimer of warranty; keep intact\par
+all the notices that refer to this License and to the absence of any\par
+warranty; and distribute a copy of this License along with the\par
+Library.\par
+\par
+ You may charge a fee for the physical act of transferring a copy,\par
+and you may at your option offer warranty protection in exchange for a\par
+fee.\par
+\page\par
+ 2. You may modify your copy or copies of the Library or any portion\par
+of it, thus forming a work based on the Library, and copy and\par
+distribute such modifications or work under the terms of Section 1\par
+above, provided that you also meet all of these conditions:\par
+\par
+ a) The modified work must itself be a software library.\par
+\par
+ b) You must cause the files modified to carry prominent notices\par
+ stating that you changed the files and the date of any change.\par
+\par
+ c) You must cause the whole of the work to be licensed at no\par
+ charge to all third parties under the terms of this License.\par
+\par
+ d) If a facility in the modified Library refers to a function or a\par
+ table of data to be supplied by an application program that uses\par
+ the facility, other than as an argument passed when the facility\par
+ is invoked, then you must make a good faith effort to ensure that,\par
+ in the event an application does not supply such function or\par
+ table, the facility still operates, and performs whatever part of\par
+ its purpose remains meaningful.\par
+\par
+ (For example, a function in a library to compute square roots has\par
+ a purpose that is entirely well-defined independent of the\par
+ application. Therefore, Subsection 2d requires that any\par
+ application-supplied function or table used by this function must\par
+ be optional: if the application does not supply it, the square\par
+ root function must still compute square roots.)\par
+\par
+These requirements apply to the modified work as a whole. If\par
+identifiable sections of that work are not derived from the Library,\par
+and can be reasonably considered independent and separate works in\par
+themselves, then this License, and its terms, do not apply to those\par
+sections when you distribute them as separate works. But when you\par
+distribute the same sections as part of a whole which is a work based\par
+on the Library, the distribution of the whole must be on the terms of\par
+this License, whose permissions for other licensees extend to the\par
+entire whole, and thus to each and every part regardless of who wrote\par
+it.\par
+\par
+Thus, it is not the intent of this section to claim rights or contest\par
+your rights to work written entirely by you; rather, the intent is to\par
+exercise the right to control the distribution of derivative or\par
+collective works based on the Library.\par
+\par
+In addition, mere aggregation of another work not based on the Library\par
+with the Library (or with a work based on the Library) on a volume of\par
+a storage or distribution medium does not bring the other work under\par
+the scope of this License.\par
+\par
+ 3. You may opt to apply the terms of the ordinary GNU General Public\par
+License instead of this License to a given copy of the Library. To do\par
+this, you must alter all the notices that refer to this License, so\par
+that they refer to the ordinary GNU General Public License, version 2,\par
+instead of to this License. (If a newer version than version 2 of the\par
+ordinary GNU General Public License has appeared, then you can specify\par
+that version instead if you wish.) Do not make any other change in\par
+these notices.\par
+\page\par
+ Once this change is made in a given copy, it is irreversible for\par
+that copy, so the ordinary GNU General Public License applies to all\par
+subsequent copies and derivative works made from that copy.\par
+\par
+ This option is useful when you wish to copy part of the code of\par
+the Library into a program that is not a library.\par
+\par
+ 4. You may copy and distribute the Library (or a portion or\par
+derivative of it, under Section 2) in object code or executable form\par
+under the terms of Sections 1 and 2 above provided that you accompany\par
+it with the complete corresponding machine-readable source code, which\par
+must be distributed under the terms of Sections 1 and 2 above on a\par
+medium customarily used for software interchange.\par
+\par
+ If distribution of object code is made by offering access to copy\par
+from a designated place, then offering equivalent access to copy the\par
+source code from the same place satisfies the requirement to\par
+distribute the source code, even though third parties are not\par
+compelled to copy the source along with the object code.\par
+\par
+ 5. A program that contains no derivative of any portion of the\par
+Library, but is designed to work with the Library by being compiled or\par
+linked with it, is called a "work that uses the Library". Such a\par
+work, in isolation, is not a derivative work of the Library, and\par
+therefore falls outside the scope of this License.\par
+\par
+ However, linking a "work that uses the Library" with the Library\par
+creates an executable that is a derivative of the Library (because it\par
+contains portions of the Library), rather than a "work that uses the\par
+library". The executable is therefore covered by this License.\par
+Section 6 states terms for distribution of such executables.\par
+\par
+ When a "work that uses the Library" uses material from a header file\par
+that is part of the Library, the object code for the work may be a\par
+derivative work of the Library even though the source code is not.\par
+Whether this is true is especially significant if the work can be\par
+linked without the Library, or if the work is itself a library. The\par
+threshold for this to be true is not precisely defined by law.\par
+\par
+ If such an object file uses only numerical parameters, data\par
+structure layouts and accessors, and small macros and small inline\par
+functions (ten lines or less in length), then the use of the object\par
+file is unrestricted, regardless of whether it is legally a derivative\par
+work. (Executables containing this object code plus portions of the\par
+Library will still fall under Section 6.)\par
+\par
+ Otherwise, if the work is a derivative of the Library, you may\par
+distribute the object code for the work under the terms of Section 6.\par
+Any executables containing that work also fall under Section 6,\par
+whether or not they are linked directly with the Library itself.\par
+\page\par
+ 6. As an exception to the Sections above, you may also combine or\par
+link a "work that uses the Library" with the Library to produce a\par
+work containing portions of the Library, and distribute that work\par
+under terms of your choice, provided that the terms permit\par
+modification of the work for the customer's own use and reverse\par
+engineering for debugging such modifications.\par
+\par
+ You must give prominent notice with each copy of the work that the\par
+Library is used in it and that the Library and its use are covered by\par
+this License. You must supply a copy of this License. If the work\par
+during execution displays copyright notices, you must include the\par
+copyright notice for the Library among them, as well as a reference\par
+directing the user to the copy of this License. Also, you must do one\par
+of these things:\par
+\par
+ a) Accompany the work with the complete corresponding\par
+ machine-readable source code for the Library including whatever\par
+ changes were used in the work (which must be distributed under\par
+ Sections 1 and 2 above); and, if the work is an executable linked\par
+ with the Library, with the complete machine-readable "work that\par
+ uses the Library", as object code and/or source code, so that the\par
+ user can modify the Library and then relink to produce a modified\par
+ executable containing the modified Library. (It is understood\par
+ that the user who changes the contents of definitions files in the\par
+ Library will not necessarily be able to recompile the application\par
+ to use the modified definitions.)\par
+\par
+ b) Use a suitable shared library mechanism for linking with the\par
+ Library. A suitable mechanism is one that (1) uses at run time a\par
+ copy of the library already present on the user's computer system,\par
+ rather than copying library functions into the executable, and (2)\par
+ will operate properly with a modified version of the library, if\par
+ the user installs one, as long as the modified version is\par
+ interface-compatible with the version that the work was made with.\par
+\par
+ c) Accompany the work with a written offer, valid for at\par
+ least three years, to give the same user the materials\par
+ specified in Subsection 6a, above, for a charge no more\par
+ than the cost of performing this distribution.\par
+\par
+ d) If distribution of the work is made by offering access to copy\par
+ from a designated place, offer equivalent access to copy the above\par
+ specified materials from the same place.\par
+\par
+ e) Verify that the user has already received a copy of these\par
+ materials or that you have already sent this user a copy.\par
+\par
+ For an executable, the required form of the "work that uses the\par
+Library" must include any data and utility programs needed for\par
+reproducing the executable from it. However, as a special exception,\par
+the materials to be distributed need not include anything that is\par
+normally distributed (in either source or binary form) with the major\par
+components (compiler, kernel, and so on) of the operating system on\par
+which the executable runs, unless that component itself accompanies\par
+the executable.\par
+\par
+ It may happen that this requirement contradicts the license\par
+restrictions of other proprietary libraries that do not normally\par
+accompany the operating system. Such a contradiction means you cannot\par
+use both them and the Library together in an executable that you\par
+distribute.\par
+\page\par
+ 7. You may place library facilities that are a work based on the\par
+Library side-by-side in a single library together with other library\par
+facilities not covered by this License, and distribute such a combined\par
+library, provided that the separate distribution of the work based on\par
+the Library and of the other library facilities is otherwise\par
+permitted, and provided that you do these two things:\par
+\par
+ a) Accompany the combined library with a copy of the same work\par
+ based on the Library, uncombined with any other library\par
+ facilities. This must be distributed under the terms of the\par
+ Sections above.\par
+\par
+ b) Give prominent notice with the combined library of the fact\par
+ that part of it is a work based on the Library, and explaining\par
+ where to find the accompanying uncombined form of the same work.\par
+\par
+ 8. You may not copy, modify, sublicense, link with, or distribute\par
+the Library except as expressly provided under this License. Any\par
+attempt otherwise to copy, modify, sublicense, link with, or\par
+distribute the Library is void, and will automatically terminate your\par
+rights under this License. However, parties who have received copies,\par
+or rights, from you under this License will not have their licenses\par
+terminated so long as such parties remain in full compliance.\par
+\par
+ 9. You are not required to accept this License, since you have not\par
+signed it. However, nothing else grants you permission to modify or\par
+distribute the Library or its derivative works. These actions are\par
+prohibited by law if you do not accept this License. Therefore, by\par
+modifying or distributing the Library (or any work based on the\par
+Library), you indicate your acceptance of this License to do so, and\par
+all its terms and conditions for copying, distributing or modifying\par
+the Library or works based on it.\par
+\par
+ 10. Each time you redistribute the Library (or any work based on the\par
+Library), the recipient automatically receives a license from the\par
+original licensor to copy, distribute, link with or modify the Library\par
+subject to these terms and conditions. You may not impose any further\par
+restrictions on the recipients' exercise of the rights granted herein.\par
+You are not responsible for enforcing compliance by third parties with\par
+this License.\par
+\page\par
+ 11. If, as a consequence of a court judgment or allegation of patent\par
+infringement or for any other reason (not limited to patent issues),\par
+conditions are imposed on you (whether by court order, agreement or\par
+otherwise) that contradict the conditions of this License, they do not\par
+excuse you from the conditions of this License. If you cannot\par
+distribute so as to satisfy simultaneously your obligations under this\par
+License and any other pertinent obligations, then as a consequence you\par
+may not distribute the Library at all. For example, if a patent\par
+license would not permit royalty-free redistribution of the Library by\par
+all those who receive copies directly or indirectly through you, then\par
+the only way you could satisfy both it and this License would be to\par
+refrain entirely from distribution of the Library.\par
+\par
+If any portion of this section is held invalid or unenforceable under any\par
+particular circumstance, the balance of the section is intended to apply,\par
+and the section as a whole is intended to apply in other circumstances.\par
+\par
+It is not the purpose of this section to induce you to infringe any\par
+patents or other property right claims or to contest validity of any\par
+such claims; this section has the sole purpose of protecting the\par
+integrity of the free software distribution system which is\par
+implemented by public license practices. Many people have made\par
+generous contributions to the wide range of software distributed\par
+through that system in reliance on consistent application of that\par
+system; it is up to the author/donor to decide if he or she is willing\par
+to distribute software through any other system and a licensee cannot\par
+impose that choice.\par
+\par
+This section is intended to make thoroughly clear what is believed to\par
+be a consequence of the rest of this License.\par
+\par
+ 12. If the distribution and/or use of the Library is restricted in\par
+certain countries either by patents or by copyrighted interfaces, the\par
+original copyright holder who places the Library under this License may add\par
+an explicit geographical distribution limitation excluding those countries,\par
+so that distribution is permitted only in or among countries not thus\par
+excluded. In such case, this License incorporates the limitation as if\par
+written in the body of this License.\par
+\par
+ 13. The Free Software Foundation may publish revised and/or new\par
+versions of the Lesser General Public License from time to time.\par
+Such new versions will be similar in spirit to the present version,\par
+but may differ in detail to address new problems or concerns.\par
+\par
+Each version is given a distinguishing version number. If the Library\par
+specifies a version number of this License which applies to it and\par
+"any later version", you have the option of following the terms and\par
+conditions either of that version or of any later version published by\par
+the Free Software Foundation. If the Library does not specify a\par
+license version number, you may choose any version ever published by\par
+the Free Software Foundation.\par
+\page\par
+ 14. If you wish to incorporate parts of the Library into other free\par
+programs whose distribution conditions are incompatible with these,\par
+write to the author to ask for permission. For software which is\par
+copyrighted by the Free Software Foundation, write to the Free\par
+Software Foundation; we sometimes make exceptions for this. Our\par
+decision will be guided by the two goals of preserving the free status\par
+of all derivatives of our free software and of promoting the sharing\par
+and reuse of software generally.\par
+\par
+\tab\tab\tab NO WARRANTY\par
+\par
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO\par
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.\par
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR\par
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY\par
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE\par
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\par
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE\par
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME\par
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par
+\par
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN\par
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY\par
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU\par
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR\par
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE\par
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING\par
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A\par
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF\par
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\par
+DAMAGES.\par
+\par
+\tab\tab END OF TERMS AND CONDITIONS\par
+\page\par
+}
+ |
|
From: <gl...@us...> - 2007-06-14 20:34:52
|
Revision: 151
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=151&view=rev
Author: glslang
Date: 2007-06-14 13:34:49 -0700 (Thu, 14 Jun 2007)
Log Message:
-----------
+ os/x framework mods
Modified Paths:
--------------
trunk/lib/openlibraries/src/openmedialib/plugins/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp
trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp
trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
trunk/unity.sh
Removed Paths:
-------------
trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.mode1
trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.pbxuser
Deleted: trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.mode1
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.mode1 2007-06-10 17:40:14 UTC (rev 150)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.mode1 2007-06-14 20:34:49 UTC (rev 151)
@@ -1,1330 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>ActivePerspectiveName</key>
- <string>Project</string>
- <key>AllowedModules</key>
- <array>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXSmartGroupTreeModule</string>
- <key>Name</key>
- <string>Groups and Files Outline View</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Name</key>
- <string>Editor</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>XCTaskListModule</string>
- <key>Name</key>
- <string>Task List</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>XCDetailModule</string>
- <key>Name</key>
- <string>File and Smart Group Detail Viewer</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>1</string>
- <key>Module</key>
- <string>PBXBuildResultsModule</string>
- <key>Name</key>
- <string>Detailed Build Results Viewer</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>1</string>
- <key>Module</key>
- <string>PBXProjectFindModule</string>
- <key>Name</key>
- <string>Project Batch Find Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXRunSessionModule</string>
- <key>Name</key>
- <string>Run Log</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXBookmarksModule</string>
- <key>Name</key>
- <string>Bookmarks Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXClassBrowserModule</string>
- <key>Name</key>
- <string>Class Browser</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXCVSModule</string>
- <key>Name</key>
- <string>Source Code Control Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXDebugBreakpointsModule</string>
- <key>Name</key>
- <string>Debug Breakpoints Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>XCDockableInspector</string>
- <key>Name</key>
- <string>Inspector</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXOpenQuicklyModule</string>
- <key>Name</key>
- <string>Open Quickly Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>1</string>
- <key>Module</key>
- <string>PBXDebugSessionModule</string>
- <key>Name</key>
- <string>Debugger</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>1</string>
- <key>Module</key>
- <string>PBXDebugCLIModule</string>
- <key>Name</key>
- <string>Debug Console</string>
- </dict>
- </array>
- <key>Description</key>
- <string>DefaultDescriptionKey</string>
- <key>DockingSystemVisible</key>
- <false/>
- <key>Extension</key>
- <string>mode1</string>
- <key>FavBarConfig</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>6785B4070C0B3E08008277DB</string>
- <key>XCBarModuleItemNames</key>
- <dict/>
- <key>XCBarModuleItems</key>
- <array/>
- </dict>
- <key>FirstTimeWindowDisplayed</key>
- <false/>
- <key>Identifier</key>
- <string>com.apple.perspectives.project.mode1</string>
- <key>MajorVersion</key>
- <integer>31</integer>
- <key>MinorVersion</key>
- <integer>1</integer>
- <key>Name</key>
- <string>Default</string>
- <key>Notifications</key>
- <array/>
- <key>OpenEditors</key>
- <array/>
- <key>PerspectiveWidths</key>
- <array>
- <integer>-1</integer>
- <integer>-1</integer>
- </array>
- <key>Perspectives</key>
- <array>
- <dict>
- <key>ChosenToolbarItems</key>
- <array>
- <string>active-target-popup</string>
- <string>active-buildstyle-popup</string>
- <string>action</string>
- <string>NSToolbarFlexibleSpaceItem</string>
- <string>buildOrClean</string>
- <string>build-and-runOrDebug</string>
- <string>com.apple.ide.PBXToolbarStopButton</string>
- <string>get-info</string>
- <string>toggle-editor</string>
- <string>NSToolbarFlexibleSpaceItem</string>
- <string>com.apple.pbx.toolbar.searchfield</string>
- </array>
- <key>ControllerClassBaseName</key>
- <string></string>
- <key>IconName</key>
- <string>WindowOfProjectWithEditor</string>
- <key>Identifier</key>
- <string>perspective.project</string>
- <key>IsVertical</key>
- <false/>
- <key>Layout</key>
- <array>
- <dict>
- <key>BecomeActive</key>
- <true/>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXBottomSmartGroupGIDs</key>
- <array>
- <string>1C37FBAC04509CD000000102</string>
- <string>1C37FAAC04509CD000000102</string>
- <string>1C08E77C0454961000C914BD</string>
- <string>1C37FABC05509CD000000102</string>
- <string>1C37FABC05539CD112110102</string>
- <string>E2644B35053B69B200211256</string>
- <string>1C37FABC04509CD000100104</string>
- <string>1CC0EA4004350EF90044410B</string>
- <string>1CC0EA4004350EF90041110B</string>
- </array>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B1FE06471DED0097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>Files</string>
- <key>PBXProjectStructureProvided</key>
- <string>yes</string>
- <key>PBXSmartGroupTreeModuleColumnData</key>
- <dict>
- <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
- <array>
- <real>186</real>
- </array>
- <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
- <array>
- <string>MainColumn</string>
- </array>
- </dict>
- <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
- <dict>
- <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
- <array>
- <string>29B97314FDCFA39411CA2CEA</string>
- <string>1C37FABC05509CD000000102</string>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
- <array>
- <array>
- <integer>0</integer>
- </array>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {186, 338}}</string>
- </dict>
- <key>PBXTopSmartGroupGIDs</key>
- <array/>
- <key>XCIncludePerspectivesSwitch</key>
- <true/>
- <key>XCSharingToken</key>
- <string>com.apple.Xcode.GFSharingToken</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {203, 356}}</string>
- <key>GroupTreeTableConfiguration</key>
- <array>
- <string>MainColumn</string>
- <real>186</real>
- </array>
- <key>RubberWindowFrame</key>
- <string>295 360 690 397 0 0 1280 778 </string>
- </dict>
- <key>Module</key>
- <string>PBXSmartGroupTreeModule</string>
- <key>Proportion</key>
- <string>203pt</string>
- </dict>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B20306471E060097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>MyNewFile14.java</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B20406471E060097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>MyNewFile14.java</string>
- </dict>
- <key>SplitCount</key>
- <string>1</string>
- </dict>
- <key>StatusBarVisibility</key>
- <true/>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {482, 0}}</string>
- <key>RubberWindowFrame</key>
- <string>295 360 690 397 0 0 1280 778 </string>
- </dict>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Proportion</key>
- <string>0pt</string>
- </dict>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B20506471E060097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>Detail</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 5}, {482, 351}}</string>
- <key>RubberWindowFrame</key>
- <string>295 360 690 397 0 0 1280 778 </string>
- </dict>
- <key>Module</key>
- <string>XCDetailModule</string>
- <key>Proportion</key>
- <string>351pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>482pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Project</string>
- <key>ServiceClasses</key>
- <array>
- <string>XCModuleDock</string>
- <string>PBXSmartGroupTreeModule</string>
- <string>XCModuleDock</string>
- <string>PBXNavigatorGroup</string>
- <string>XCDetailModule</string>
- </array>
- <key>TableOfContents</key>
- <array>
- <string>6785B4050C0B3E08008277DB</string>
- <string>1CE0B1FE06471DED0097A5F4</string>
- <string>6785B4060C0B3E08008277DB</string>
- <string>1CE0B20306471E060097A5F4</string>
- <string>1CE0B20506471E060097A5F4</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.default</string>
- </dict>
- <dict>
- <key>ControllerClassBaseName</key>
- <string></string>
- <key>IconName</key>
- <string>WindowOfProject</string>
- <key>Identifier</key>
- <string>perspective.morph</string>
- <key>IsVertical</key>
- <integer>0</integer>
- <key>Layout</key>
- <array>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXBottomSmartGroupGIDs</key>
- <array>
- <string>1C37FBAC04509CD000000102</string>
- <string>1C37FAAC04509CD000000102</string>
- <string>1C08E77C0454961000C914BD</string>
- <string>1C37FABC05509CD000000102</string>
- <string>1C37FABC05539CD112110102</string>
- <string>E2644B35053B69B200211256</string>
- <string>1C37FABC04509CD000100104</string>
- <string>1CC0EA4004350EF90044410B</string>
- <string>1CC0EA4004350EF90041110B</string>
- </array>
- <key>PBXProjectModuleGUID</key>
- <string>11E0B1FE06471DED0097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>Files</string>
- <key>PBXProjectStructureProvided</key>
- <string>yes</string>
- <key>PBXSmartGroupTreeModuleColumnData</key>
- <dict>
- <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
- <array>
- <real>186</real>
- </array>
- <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
- <array>
- <string>MainColumn</string>
- </array>
- </dict>
- <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
- <dict>
- <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
- <array>
- <string>29B97314FDCFA39411CA2CEA</string>
- <string>1C37FABC05509CD000000102</string>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
- <array>
- <array>
- <integer>0</integer>
- </array>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {186, 337}}</string>
- </dict>
- <key>PBXTopSmartGroupGIDs</key>
- <array/>
- <key>XCIncludePerspectivesSwitch</key>
- <integer>1</integer>
- <key>XCSharingToken</key>
- <string>com.apple.Xcode.GFSharingToken</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {203, 355}}</string>
- <key>GroupTreeTableConfiguration</key>
- <array>
- <string>MainColumn</string>
- <real>186</real>
- </array>
- <key>RubberWindowFrame</key>
- <string>373 269 690 397 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXSmartGroupTreeModule</string>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Morph</string>
- <key>PreferredWidth</key>
- <integer>300</integer>
- <key>ServiceClasses</key>
- <array>
- <string>XCModuleDock</string>
- <string>PBXSmartGroupTreeModule</string>
- </array>
- <key>TableOfContents</key>
- <array>
- <string>11E0B1FE06471DED0097A5F4</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.default.short</string>
- </dict>
- </array>
- <key>PerspectivesBarVisible</key>
- <false/>
- <key>ShelfIsVisible</key>
- <false/>
- <key>SourceDescription</key>
- <string>file at '/System/Library/PrivateFrameworks/DevToolsInterface.framework/Versions/A/Resources/XCPerspectivesSpecificationMode1.xcperspec'</string>
- <key>StatusbarIsVisible</key>
- <true/>
- <key>TimeStamp</key>
- <real>0.0</real>
- <key>ToolbarDisplayMode</key>
- <integer>1</integer>
- <key>ToolbarIsVisible</key>
- <true/>
- <key>ToolbarSizeMode</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Perspectives</string>
- <key>UpdateMessage</key>
- <string>The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature). You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature. Do you wish to update to the latest Workspace defaults for project '%@'?</string>
- <key>WindowJustification</key>
- <integer>5</integer>
- <key>WindowOrderList</key>
- <array>
- <string>1C0AD2B3069F1EA900FABCE6</string>
- <string>6785B4080C0B3E08008277DB</string>
- <string>/Users/goncalo/src/hdrflow/trunk/app/HDRFlow/HDRFlow.xcodeproj</string>
- </array>
- <key>WindowString</key>
- <string>295 360 690 397 0 0 1280 778 </string>
- <key>WindowTools</key>
- <array>
- <dict>
- <key>FirstTimeWindowDisplayed</key>
- <false/>
- <key>Identifier</key>
- <string>windowTool.build</string>
- <key>IsVertical</key>
- <true/>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CD0528F0623707200166675</string>
- <key>PBXProjectModuleLabel</key>
- <string></string>
- <key>StatusBarVisibility</key>
- <true/>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {500, 218}}</string>
- <key>RubberWindowFrame</key>
- <string>316 234 500 500 0 0 1280 778 </string>
- </dict>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Proportion</key>
- <string>218pt</string>
- </dict>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>XCMainBuildResultsModuleGUID</string>
- <key>PBXProjectModuleLabel</key>
- <string>Build</string>
- <key>XCBuildResultsTrigger_Collapse</key>
- <integer>1021</integer>
- <key>XCBuildResultsTrigger_Open</key>
- <integer>1011</integer>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 223}, {500, 236}}</string>
- <key>RubberWindowFrame</key>
- <string>316 234 500 500 0 0 1280 778 </string>
- </dict>
- <key>Module</key>
- <string>PBXBuildResultsModule</string>
- <key>Proportion</key>
- <string>236pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>459pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Build Results</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXBuildResultsModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <true/>
- <key>TableOfContents</key>
- <array>
- <string>6785B4080C0B3E08008277DB</string>
- <string>6785B4090C0B3E08008277DB</string>
- <string>1CD0528F0623707200166675</string>
- <string>XCMainBuildResultsModuleGUID</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.build</string>
- <key>WindowString</key>
- <string>316 234 500 500 0 0 1280 778 </string>
- <key>WindowToolGUID</key>
- <string>6785B4080C0B3E08008277DB</string>
- <key>WindowToolIsVisible</key>
- <false/>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.debugger</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>Debugger</key>
- <dict>
- <key>HorizontalSplitView</key>
- <dict>
- <key>_collapsingFrameDimension</key>
- <real>0.0</real>
- <key>_indexOfCollapsedView</key>
- <integer>0</integer>
- <key>_percentageOfCollapsedView</key>
- <real>0.0</real>
- <key>isCollapsed</key>
- <string>yes</string>
- <key>sizes</key>
- <array>
- <string>{{0, 0}, {317, 164}}</string>
- <string>{{317, 0}, {377, 164}}</string>
- </array>
- </dict>
- <key>VerticalSplitView</key>
- <dict>
- <key>_collapsingFrameDimension</key>
- <real>0.0</real>
- <key>_indexOfCollapsedView</key>
- <integer>0</integer>
- <key>_percentageOfCollapsedView</key>
- <real>0.0</real>
- <key>isCollapsed</key>
- <string>yes</string>
- <key>sizes</key>
- <array>
- <string>{{0, 0}, {694, 164}}</string>
- <string>{{0, 164}, {694, 216}}</string>
- </array>
- </dict>
- </dict>
- <key>LauncherConfigVersion</key>
- <string>8</string>
- <key>PBXProjectModuleGUID</key>
- <string>1C162984064C10D400B95A72</string>
- <key>PBXProjectModuleLabel</key>
- <string>Debug - GLUTExamples (Underwater)</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>DebugConsoleDrawerSize</key>
- <string>{100, 120}</string>
- <key>DebugConsoleVisible</key>
- <string>None</string>
- <key>DebugConsoleWindowFrame</key>
- <string>{{200, 200}, {500, 300}}</string>
- <key>DebugSTDIOWindowFrame</key>
- <string>{{200, 200}, {500, 300}}</string>
- <key>Frame</key>
- <string>{{0, 0}, {694, 380}}</string>
- <key>RubberWindowFrame</key>
- <string>321 238 694 422 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXDebugSessionModule</string>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Debugger</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXDebugSessionModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>TableOfContents</key>
- <array>
- <string>1CD10A99069EF8BA00B06720</string>
- <string>1C0AD2AB069F1E9B00FABCE6</string>
- <string>1C162984064C10D400B95A72</string>
- <string>1C0AD2AC069F1E9B00FABCE6</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.debug</string>
- <key>WindowString</key>
- <string>321 238 694 422 0 0 1440 878 </string>
- <key>WindowToolGUID</key>
- <string>1CD10A99069EF8BA00B06720</string>
- <key>WindowToolIsVisible</key>
- <integer>0</integer>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.find</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CDD528C0622207200134675</string>
- <key>PBXProjectModuleLabel</key>
- <string><No Editor></string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CD0528D0623707200166675</string>
- </dict>
- <key>SplitCount</key>
- <string>1</string>
- </dict>
- <key>StatusBarVisibility</key>
- <integer>1</integer>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {781, 167}}</string>
- <key>RubberWindowFrame</key>
- <string>62 385 781 470 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Proportion</key>
- <string>781pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>50%</string>
- </dict>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CD0528E0623707200166675</string>
- <key>PBXProjectModuleLabel</key>
- <string>Project Find</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{8, 0}, {773, 254}}</string>
- <key>RubberWindowFrame</key>
- <string>62 385 781 470 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXProjectFindModule</string>
- <key>Proportion</key>
- <string>50%</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>428pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Project Find</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXProjectFindModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>TableOfContents</key>
- <array>
- <string>1C530D57069F1CE1000CFCEE</string>
- <string>1C530D58069F1CE1000CFCEE</string>
- <string>1C530D59069F1CE1000CFCEE</string>
- <string>1CDD528C0622207200134675</string>
- <string>1C530D5A069F1CE1000CFCEE</string>
- <string>1CE0B1FE06471DED0097A5F4</string>
- <string>1CD0528E0623707200166675</string>
- </array>
- <key>WindowString</key>
- <string>62 385 781 470 0 0 1440 878 </string>
- <key>WindowToolGUID</key>
- <string>1C530D57069F1CE1000CFCEE</string>
- <key>WindowToolIsVisible</key>
- <integer>0</integer>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>MENUSEPARATOR</string>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.debuggerConsole</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1C78EAAC065D492600B07095</string>
- <key>PBXProjectModuleLabel</key>
- <string>Debugger Console</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {440, 358}}</string>
- <key>RubberWindowFrame</key>
- <string>650 41 440 400 0 0 1280 1002 </string>
- </dict>
- <key>Module</key>
- <string>PBXDebugCLIModule</string>
- <key>Proportion</key>
- <string>358pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>358pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Debugger Console</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXDebugCLIModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>TableOfContents</key>
- <array>
- <string>1C78EAAD065D492600B07095</string>
- <string>1C78EAAE065D492600B07095</string>
- <string>1C78EAAC065D492600B07095</string>
- </array>
- <key>WindowString</key>
- <string>650 41 440 400 0 0 1280 1002 </string>
- </dict>
- <dict>
- <key>FirstTimeWindowDisplayed</key>
- <false/>
- <key>Identifier</key>
- <string>windowTool.run</string>
- <key>IsVertical</key>
- <true/>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>LauncherConfigVersion</key>
- <string>3</string>
- <key>PBXProjectModuleGUID</key>
- <string>1CD0528B0623707200166675</string>
- <key>PBXProjectModuleLabel</key>
- <string>Run</string>
- <key>Runner</key>
- <dict>
- <key>HorizontalSplitView</key>
- <dict>
- <key>_collapsingFrameDimension</key>
- <real>0.0</real>
- <key>_indexOfCollapsedView</key>
- <integer>0</integer>
- <key>_percentageOfCollapsedView</key>
- <real>0.0</real>
- <key>isCollapsed</key>
- <string>yes</string>
- <key>sizes</key>
- <array>
- <string>{{0, 0}, {493, 167}}</string>
- <string>{{0, 176}, {493, 267}}</string>
- </array>
- </dict>
- <key>VerticalSplitView</key>
- <dict>
- <key>_collapsingFrameDimension</key>
- <real>0.0</real>
- <key>_indexOfCollapsedView</key>
- <integer>0</integer>
- <key>_percentageOfCollapsedView</key>
- <real>0.0</real>
- <key>isCollapsed</key>
- <string>yes</string>
- <key>sizes</key>
- <array>
- <string>{{0, 0}, {405, 443}}</string>
- <string>{{414, 0}, {514, 443}}</string>
- </array>
- </dict>
- </dict>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {459, 159}}</string>
- <key>RubberWindowFrame</key>
- <string>316 534 459 200 0 0 1280 778 </string>
- </dict>
- <key>Module</key>
- <string>PBXRunSessionModule</string>
- <key>Proportion</key>
- <string>159pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>159pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Run Log</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXRunSessionModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <true/>
- <key>TableOfContents</key>
- <array>
- <string>1C0AD2B3069F1EA900FABCE6</string>
- <string>6785B40A0C0B3E08008277DB</string>
- <string>1CD0528B0623707200166675</string>
- <string>6785B40B0C0B3E08008277DB</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.run</string>
- <key>WindowString</key>
- <string>316 534 459 200 0 0 1280 778 </string>
- <key>WindowToolGUID</key>
- <string>1C0AD2B3069F1EA900FABCE6</string>
- <key>WindowToolIsVisible</key>
- <false/>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.scm</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1C78EAB2065D492600B07095</string>
- <key>PBXProjectModuleLabel</key>
- <string><No Editor></string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1C78EAB3065D492600B07095</string>
- </dict>
- <key>SplitCount</key>
- <string>1</string>
- </dict>
- <key>StatusBarVisibility</key>
- <integer>1</integer>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {452, 0}}</string>
- <key>RubberWindowFrame</key>
- <string>743 379 452 308 0 0 1280 1002 </string>
- </dict>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Proportion</key>
- <string>0pt</string>
- </dict>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CD052920623707200166675</string>
- <key>PBXProjectModuleLabel</key>
- <string>SCM</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>ConsoleFrame</key>
- <string>{{0, 259}, {452, 0}}</string>
- <key>Frame</key>
- <string>{{0, 7}, {452, 259}}</string>
- <key>RubberWindowFrame</key>
- <string>743 379 452 308 0 0 1280 1002 </string>
- <key>TableConfiguration</key>
- <array>
- <string>Status</string>
- <real>30</real>
- <string>FileName</string>
- <real>199</real>
- <string>Path</string>
- <real>197.09500122070312</real>
- </array>
- <key>TableFrame</key>
- <string>{{0, 0}, {452, 250}}</string>
- </dict>
- <key>Module</key>
- <string>PBXCVSModule</string>
- <key>Proportion</key>
- <string>262pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>266pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>SCM</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXCVSModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>TableOfContents</key>
- <array>
- <string>1C78EAB4065D492600B07095</string>
- <string>1C78EAB5065D492600B07095</string>
- <string>1C78EAB2065D492600B07095</string>
- <string>1CD052920623707200166675</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.scm</string>
- <key>WindowString</key>
- <string>743 379 452 308 0 0 1280 1002 </string>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.breakpoints</string>
- <key>IsVertical</key>
- <integer>0</integer>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXBottomSmartGroupGIDs</key>
- <array>
- <string>1C77FABC04509CD000000102</string>
- </array>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B1FE06471DED0097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>Files</string>
- <key>PBXProjectStructureProvided</key>
- <string>no</string>
- <key>PBXSmartGroupTreeModuleColumnData</key>
- <dict>
- <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
- <array>
- <real>168</real>
- </array>
- <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
- <array>
- <string>MainColumn</string>
- </array>
- </dict>
- <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
- <dict>
- <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
- <array>
- <string>1C77FABC04509CD000000102</string>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
- <array>
- <array>
- <integer>0</integer>
- </array>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {168, 350}}</string>
- </dict>
- <key>PBXTopSmartGroupGIDs</key>
- <array/>
- <key>XCIncludePerspectivesSwitch</key>
- <integer>0</integer>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {185, 368}}</string>
- <key>GroupTreeTableConfiguration</key>
- <array>
- <string>MainColumn</string>
- <real>168</real>
- </array>
- <key>RubberWindowFrame</key>
- <string>315 424 744 409 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXSmartGroupTreeModule</string>
- <key>Proportion</key>
- <string>185pt</string>
- </dict>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CA1AED706398EBD00589147</string>
- <key>PBXProjectModuleLabel</key>
- <string>Detail</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{190, 0}, {554, 368}}</string>
- <key>RubberWindowFrame</key>
- <string>315 424 744 409 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>XCDetailModule</string>
- <key>Proportion</key>
- <string>554pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>368pt</string>
- </dict>
- </array>
- <key>MajorVersion</key>
- <integer>2</integer>
- <key>MinorVersion</key>
- <integer>0</integer>
- <key>Name</key>
- <string>Breakpoints</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXSmartGroupTreeModule</string>
- <string>XCDetailModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>TableOfContents</key>
- <array>
- <string>1CDDB66807F98D9800BB5817</string>
- <string>1CDDB66907F98D9800BB5817</string>
- <string>1CE0B1FE06471DED0097A5F4</string>
- <string>1CA1AED706398EBD00589147</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.breakpoints</string>
- <key>WindowString</key>
- <string>315 424 744 409 0 0 1440 878 </string>
- <key>WindowToolGUID</key>
- <string>1CDDB66807F98D9800BB5817</string>
- <key>WindowToolIsVisible</key>
- <integer>1</integer>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.debugAnimator</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Debug Visualizer</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXNavigatorGroup</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.debugAnimator</string>
- <key>WindowString</key>
- <string>100 100 700 500 0 0 1280 1002 </string>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.bookmarks</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>Module</key>
- <string>PBXBookmarksModule</string>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Bookmarks</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXBookmarksModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>0</integer>
- <key>WindowString</key>
- <string>538 42 401 187 0 0 1280 1002 </string>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.classBrowser</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>OptionsSetName</key>
- <string>Hierarchy, all classes</string>
- <key>PBXProjectModuleGUID</key>
- <string>1CA6456E063B45B4001379D8</string>
- <key>PBXProjectModuleLabel</key>
- <string>Class Browser - NSObject</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>ClassesFrame</key>
- <string>{{0, 0}, {374, 96}}</string>
- <key>ClassesTreeTableConfiguration</key>
- <array>
- <string>PBXClassNameColumnIdentifier</string>
- <real>208</real>
- <string>PBXClassBookColumnIdentifier</string>
- <real>22</real>
- </array>
- <key>Frame</key>
- <string>{{0, 0}, {630, 331}}</string>
- <key>MembersFrame</key>
- <string>{{0, 105}, {374, 395}}</string>
- <key>MembersTreeTableConfiguration</key>
- <array>
- <string>PBXMemberTypeIconColumnIdentifier</string>
- <real>22</real>
- <string>PBXMemberNameColumnIdentifier</string>
- <real>216</real>
- <string>PBXMemberTypeColumnIdentifier</string>
- <real>97</real>
- <string>PBXMemberBookColumnIdentifier</string>
- <real>22</real>
- </array>
- <key>PBXModuleWindowStatusBarHidden2</key>
- <integer>1</integer>
- <key>RubberWindowFrame</key>
- <string>385 179 630 352 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXClassBrowserModule</string>
- <key>Proportion</key>
- <string>332pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>332pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Class Browser</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXClassBrowserModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>0</integer>
- <key>TableOfContents</key>
- <array>
- <string>1C0AD2AF069F1E9B00FABCE6</string>
- <string>1C0AD2B0069F1E9B00FABCE6</string>
- <string>1CA6456E063B45B4001379D8</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.classbrowser</string>
- <key>WindowString</key>
- <string>385 179 630 352 0 0 1440 878 </string>
- <key>WindowToolGUID</key>
- <string>1C0AD2AF069F1E9B00FABCE6</string>
- <key>WindowToolIsVisible</key>
- <integer>0</integer>
- </dict>
- </array>
-</dict>
-</plist>
Deleted: trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.pbxuser
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.pbxuser 2007-06-10 17:40:14 UTC (rev 150)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.pbxuser 2007-06-14 20:34:49 UTC (rev 151)
@@ -1,83 +0,0 @@
-// !$*UTF8*$!
-{
- 29B97313FDCFA39411CA2CEA /* Project object */ = {
- activeBuildConfigurationName = Debug;
- activeExecutable = 6785B3F80C0B3DEB008277DB /* HDRFlow */;
- activeTarget = 8D1107260486CEB800E47090 /* HDRFlow */;
- codeSenseManager = 6785B40D0C0B3E08008277DB /* Code sense */;
- executables = (
- 6785B3F80C0B3DEB008277DB /* HDRFlow */,
- );
- perUserDictionary = {
- PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
- PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
- PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
- PBXFileTableDataSourceColumnWidthsKey = (
- 20,
- 243,
- 20,
- 48.1626,
- 43,
- 43,
- 20,
- );
- PBXFileTableDataSourceColumnsKey = (
- PBXFileDataSource_FiletypeID,
- PBXFileDataSource_Filename_ColumnID,
- PBXFileDataSource_Built_ColumnID,
- PBXFileDataSource_ObjectSize_ColumnID,
- PBXFileDataSource_Errors_ColumnID,
- PBXFileDataSource_Warnings_ColumnID,
- PBXFileDataSource_Target_ColumnID,
- );
- };
- PBXPerProjectTemplateStateSaveDate = 202063339;
- PBXWorkspaceStateSaveDate = 202063339;
- };
- sourceControlManager = 6785B40C0C0B3E08008277DB /* Source Control */;
- userBuildSettings = {
- };
- };
- 6785B3F80C0B3DEB008277DB /* HDRFlow */ = {
- isa = PBXExecutable;
- activeArgIndex = 2147483647;
- activeArgIndices = (
- );
- argumentStrings = (
- );
- autoAttachOnCrash = 1;
- configStateDict = {
- };
- customDataFormattersEnabled = 1;
- debuggerPlugin = GDBDebugging;
- disassemblyDisplayState = 0;
- dylibVariantSuffix = "";
- enableDebugStr = 1;
- environmentEntries = (
- );
- executableSystemSymbolLevel = 0;
- executableUserSymbolLevel = 0;
- libgmallocEnabled = 0;
- name = HDRFlow;
- sourceDirectories = (
- );
- };
- 6785B40C0C0B3E08008277DB /* Source Control */ = {
- isa = PBXSourceControlManager;
- fallbackIsa = XCSourceControlManager;
- isSCMEnabled = 0;
- scmConfiguration = {
- };
- scmType = "";
- };
- 6785B40D0C0B3E08008277DB /* Code sense */ = {
- isa = PBXCodeSenseManager;
- indexTemplatePath = "";
- };
- 8D1107260486CEB800E47090 /* HDRFlow */ = {
- activeExec = 0;
- executables = (
- 6785B3F80C0B3DEB008277DB /* HDRFlow */,
- );
- };
-}
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/Makefile.am 2007-06-10 17:40:14 UTC (rev 150)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/Makefile.am 2007-06-14 20:34:49 UTC (rev 151)
@@ -3,4 +3,4 @@
#
#
-SUBDIRS = template avformat oil caca glew openal gensys ofx
+SUBDIRS = oil ofx
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp 2007-06-10 17:40:14 UTC (rev 150)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp 2007-06-14 20:34:49 UTC (rev 151)
@@ -8,10 +8,10 @@
#ifndef GL_UTILITY_INC_
#define GL_UTILITY_INC_
+#include <utility>
+
#include <GL/glew.h>
-#include <utility>
-
#include <openpluginlib/pl/config.hpp>
#include <openpluginlib/pl/string.hpp>
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-06-10 17:40:14 UTC (rev 150)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-06-14 20:34:49 UTC (rev 151)
@@ -17,17 +17,10 @@
#include <functional>
#include <vector>
-#ifndef FMWK
#include <openpluginlib/pl/config.hpp>
#include <openpluginlib/pl/discovery_traits.hpp>
#include <openpluginlib/pl/openplugin.hpp>
#include <openpluginlib/pl/string.hpp>
-#else
-#include <HDRFlowPlugin/config.hpp>
-#include <HDRFlowPlugin/discovery_traits.hpp>
-#include <HDRFlowPlugin/openplugin.hpp>
-#include <HDRFlowPlugin/string.hpp>
-#endif
namespace olib { namespace openpluginlib {
Modified: trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp 2007-06-10 17:40:14 UTC (rev 150)
+++ trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp 2007-06-14 20:34:49 UTC (rev 151)
@@ -0,0 +1,13 @@
+
+// HDRFlow Umbrella Framework main header file.
+
+// Copyright (C) 2007 Goncalo N. M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#ifndef OPENLIBRARIES_INC_
+#define OPENLIBRARIES_INC_
+
+#include <openpluginlib/pl/openpluginlib.hpp>
+
+#endif
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-06-10 17:40:14 UTC (rev 150)
+++ trunk/unity.sh 2007-06-14 20:34:49 UTC (rev 151)
@@ -85,8 +85,13 @@
for i in $headers
do basedir=`dirname $1/$i | sed -e "s|$1||g"` &&
mkdir -p $2.framework/Versions/Current/Headers/$basedir &&
- cp -R $1/$i $2.framework/Versions/Current/Headers/$basedir
+ echo $1 > header_temp.$$
+ header_path_first=`cut -d '/' -f 5 header_temp.$$`
+ header_path_second=`cut -d '/' -f 6 header_temp.$$`
+ header_path="$header_path_first/$header_path_second"
+ sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" $1/$i > $2.framework/Versions/Current/Headers/$i
done
+ rm header_temp.$$
}
make_framework_libs( )
@@ -236,6 +241,7 @@
make_framework( )
{
+ rm -rf $1.framework
make_framework_dir $1 &&
make_framework_headers $2 $1 &&
make_framework_libs $1 $2 &&
@@ -247,11 +253,6 @@
make_framework_libs_deps $1
}
-update_umbrella_framework_install_names( )
-{
- echo "not implemented"
-}
-
make_umbrella_framework( )
{
rm -rf "./HDRFlow.framework"
@@ -288,6 +289,41 @@
esac
fi
done
+
+ deplist="GLEW boost"
+ for i in $deplist
+ do fmwklist="HDRFlowPlugin HDRFlowImage HDRFlowMedia"
+ for j in $fmwklist
+ do depname=`otool -L HDRFlow.framework/Frameworks/$j.framework/$j | grep $i | cut -d ' ' -f 1`
+ for k in $depname
+ do base=`basename $k`
+ install_name_tool -change $k \
+ $install_name_prefix/HDRFlow.framework/Versions/$framework_version/Libraries/$base \
+ HDRFlow.framework/Versions/$framework_version/Frameworks/$j.framework/$j
+ done
+ done
+ done
+
+ # Umbrella Framework Header
+ deplist="openpluginlib/pl openimagelib/il openmedialib/ml"
+ for i in $deplist
+ do case $i in
+ openpluginlib* )
+ sed -e "s|$i|HDRFlowPlugin|g" -i '' HDRFlow.framework/Versions/$framework_version/Headers/openlibraries.hpp
+ ;;
+ openimagelib* )
+ sed -e "s|$i|HDRFlowImage|g" -i '' HDRFlow.framework/Versions/$framework_version/Headers/openlibraries.hpp
+ ;;
+ openmedialib* )
+ sed -e "s|$i|HDRFlowMedia|g" -i '' HDRFlow.framework/Versions/$framework_version/Headers/openlibraries.hpp
+ ;;
+ esac
+ done
+
+ # Copy Boost headers
+ cp -R /usr/local/include/boost-1_35/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
+ header_prefix="HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers/boost"
+ find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''
}
if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-10 17:40:15
|
Revision: 150
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=150&view=rev
Author: glslang
Date: 2007-06-10 10:40:14 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
+AUTHORS update
Modified Paths:
--------------
trunk/lib/extras/AUTHORS
Modified: trunk/lib/extras/AUTHORS
===================================================================
--- trunk/lib/extras/AUTHORS 2007-06-10 17:26:06 UTC (rev 149)
+++ trunk/lib/extras/AUTHORS 2007-06-10 17:40:14 UTC (rev 150)
@@ -1 +1 @@
-Goncalo N. M. de Carvalho (gl...@gm...)
\ No newline at end of file
+Goncalo Carvalho (gl...@gm...)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-10 17:26:07
|
Revision: 149
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=149&view=rev
Author: glslang
Date: 2007-06-10 10:26:06 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
+ build updates
Modified Paths:
--------------
trunk/lib/extras/AUTHORS
trunk/lib/extras/extras_vc8.sln
Modified: trunk/lib/extras/AUTHORS
===================================================================
--- trunk/lib/extras/AUTHORS 2007-06-10 16:34:50 UTC (rev 148)
+++ trunk/lib/extras/AUTHORS 2007-06-10 17:26:06 UTC (rev 149)
@@ -0,0 +1 @@
+Goncalo N. M. de Carvalho (gl...@gm...)
\ No newline at end of file
Modified: trunk/lib/extras/extras_vc8.sln
===================================================================
--- trunk/lib/extras/extras_vc8.sln 2007-06-10 16:34:50 UTC (rev 148)
+++ trunk/lib/extras/extras_vc8.sln 2007-06-10 17:26:06 UTC (rev 149)
@@ -16,24 +16,50 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "panoramic", "src\panoramic\panoramic_vc8.vcproj", "{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JP2", "JP2", "{CE7A290A-13C0-424E-A02A-96CDC6B0E6BE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jp2", "src\jp2\jp2_vc8.vcproj", "{9A2197B4-ABC1-4047-A81B-15E9D228C108}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
Multi-threaded Release DLL|Win32 = Multi-threaded Release DLL|Win32
+ Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {9A2197B4-ABC1-4047-A81B-15E9D228C108}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9A2197B4-ABC1-4047-A81B-15E9D228C108}.Debug|Win32.Build.0 = Debug|Win32
+ {9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Debug DLL|Win32.Build.0 = Debug|Win32
+ {9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Release DLL|Win32.ActiveCfg = Release|Win32
+ {9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Release DLL|Win32.Build.0 = Release|Win32
+ {9A2197B4-ABC1-4047-A81B-15E9D228C108}.Release|Win32.ActiveCfg = Release|Win32
+ {9A2197B4-ABC1-4047-A81B-15E9D228C108}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -42,8 +68,10 @@
{675FBBBA-6681-49E3-AAC6-FE371310DA63} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
{E0C3CF4A-5F43-4BBC-B7A9-6D4CDB225CD9} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
{D133B05E-F174-4CDA-8FF4-C45C139CFACD} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
+ {CE7A290A-13C0-424E-A02A-96CDC6B0E6BE} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8} = {675FBBBA-6681-49E3-AAC6-FE371310DA63}
{008BA3EE-35D6-432D-96B6-F65707CCCFBF} = {675FBBBA-6681-49E3-AAC6-FE371310DA63}
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373} = {D133B05E-F174-4CDA-8FF4-C45C139CFACD}
+ {9A2197B4-ABC1-4047-A81B-15E9D228C108} = {CE7A290A-13C0-424E-A02A-96CDC6B0E6BE}
EndGlobalSection
EndGlobal
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-10 16:34:52
|
Revision: 148
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=148&view=rev
Author: glslang
Date: 2007-06-10 09:34:50 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
+initial HDRFlow app skeleton
Added Paths:
-----------
trunk/app/HDRFlow/
trunk/app/HDRFlow/English.lproj/
trunk/app/HDRFlow/English.lproj/InfoPlist.strings
trunk/app/HDRFlow/English.lproj/MainMenu.nib/
trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlow.xcodeproj/
trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.mode1
trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.pbxuser
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
trunk/app/HDRFlow/HDRFlow_Prefix.pch
trunk/app/HDRFlow/Info.plist
trunk/app/HDRFlow/main.m
Added: trunk/app/HDRFlow/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Property changes on: trunk/app/HDRFlow/English.lproj/InfoPlist.strings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib (rev 0)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib 2007-06-10 16:34:50 UTC (rev 148)
@@ -0,0 +1,4 @@
+{
+ IBClasses = ({CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; });
+ IBVersion = 1;
+}
\ No newline at end of file
Added: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib (rev 0)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-06-10 16:34:50 UTC (rev 148)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBDocumentLocation</key>
+ <string>94 103 356 240 0 0 1280 1002 </string>
+ <key>IBEditorPositions</key>
+ <dict>
+ <key>29</key>
+ <string>93 343 318 44 0 0 1280 1002 </string>
+ </dict>
+ <key>IBFramework Version</key>
+ <string>401.0</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>29</integer>
+ <integer>21</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>8A259</string>
+</dict>
+</plist>
Added: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Property changes on: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.mode1
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.mode1 (rev 0)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.mode1 2007-06-10 16:34:50 UTC (rev 148)
@@ -0,0 +1,1330 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>ActivePerspectiveName</key>
+ <string>Project</string>
+ <key>AllowedModules</key>
+ <array>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXSmartGroupTreeModule</string>
+ <key>Name</key>
+ <string>Groups and Files Outline View</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXNavigatorGroup</string>
+ <key>Name</key>
+ <string>Editor</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>XCTaskListModule</string>
+ <key>Name</key>
+ <string>Task List</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>XCDetailModule</string>
+ <key>Name</key>
+ <string>File and Smart Group Detail Viewer</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>1</string>
+ <key>Module</key>
+ <string>PBXBuildResultsModule</string>
+ <key>Name</key>
+ <string>Detailed Build Results Viewer</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>1</string>
+ <key>Module</key>
+ <string>PBXProjectFindModule</string>
+ <key>Name</key>
+ <string>Project Batch Find Tool</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXRunSessionModule</string>
+ <key>Name</key>
+ <string>Run Log</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXBookmarksModule</string>
+ <key>Name</key>
+ <string>Bookmarks Tool</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXClassBrowserModule</string>
+ <key>Name</key>
+ <string>Class Browser</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXCVSModule</string>
+ <key>Name</key>
+ <string>Source Code Control Tool</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXDebugBreakpointsModule</string>
+ <key>Name</key>
+ <string>Debug Breakpoints Tool</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>XCDockableInspector</string>
+ <key>Name</key>
+ <string>Inspector</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXOpenQuicklyModule</string>
+ <key>Name</key>
+ <string>Open Quickly Tool</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>1</string>
+ <key>Module</key>
+ <string>PBXDebugSessionModule</string>
+ <key>Name</key>
+ <string>Debugger</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>1</string>
+ <key>Module</key>
+ <string>PBXDebugCLIModule</string>
+ <key>Name</key>
+ <string>Debug Console</string>
+ </dict>
+ </array>
+ <key>Description</key>
+ <string>DefaultDescriptionKey</string>
+ <key>DockingSystemVisible</key>
+ <false/>
+ <key>Extension</key>
+ <string>mode1</string>
+ <key>FavBarConfig</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>6785B4070C0B3E08008277DB</string>
+ <key>XCBarModuleItemNames</key>
+ <dict/>
+ <key>XCBarModuleItems</key>
+ <array/>
+ </dict>
+ <key>FirstTimeWindowDisplayed</key>
+ <false/>
+ <key>Identifier</key>
+ <string>com.apple.perspectives.project.mode1</string>
+ <key>MajorVersion</key>
+ <integer>31</integer>
+ <key>MinorVersion</key>
+ <integer>1</integer>
+ <key>Name</key>
+ <string>Default</string>
+ <key>Notifications</key>
+ <array/>
+ <key>OpenEditors</key>
+ <array/>
+ <key>PerspectiveWidths</key>
+ <array>
+ <integer>-1</integer>
+ <integer>-1</integer>
+ </array>
+ <key>Perspectives</key>
+ <array>
+ <dict>
+ <key>ChosenToolbarItems</key>
+ <array>
+ <string>active-target-popup</string>
+ <string>active-buildstyle-popup</string>
+ <string>action</string>
+ <string>NSToolbarFlexibleSpaceItem</string>
+ <string>buildOrClean</string>
+ <string>build-and-runOrDebug</string>
+ <string>com.apple.ide.PBXToolbarStopButton</string>
+ <string>get-info</string>
+ <string>toggle-editor</string>
+ <string>NSToolbarFlexibleSpaceItem</string>
+ <string>com.apple.pbx.toolbar.searchfield</string>
+ </array>
+ <key>ControllerClassBaseName</key>
+ <string></string>
+ <key>IconName</key>
+ <string>WindowOfProjectWithEditor</string>
+ <key>Identifier</key>
+ <string>perspective.project</string>
+ <key>IsVertical</key>
+ <false/>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>BecomeActive</key>
+ <true/>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXBottomSmartGroupGIDs</key>
+ <array>
+ <string>1C37FBAC04509CD000000102</string>
+ <string>1C37FAAC04509CD000000102</string>
+ <string>1C08E77C0454961000C914BD</string>
+ <string>1C37FABC05509CD000000102</string>
+ <string>1C37FABC05539CD112110102</string>
+ <string>E2644B35053B69B200211256</string>
+ <string>1C37FABC04509CD000100104</string>
+ <string>1CC0EA4004350EF90044410B</string>
+ <string>1CC0EA4004350EF90041110B</string>
+ </array>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CE0B1FE06471DED0097A5F4</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Files</string>
+ <key>PBXProjectStructureProvided</key>
+ <string>yes</string>
+ <key>PBXSmartGroupTreeModuleColumnData</key>
+ <dict>
+ <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
+ <array>
+ <real>186</real>
+ </array>
+ <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
+ <array>
+ <string>MainColumn</string>
+ </array>
+ </dict>
+ <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
+ <dict>
+ <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
+ <array>
+ <string>29B97314FDCFA39411CA2CEA</string>
+ <string>1C37FABC05509CD000000102</string>
+ </array>
+ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
+ <array>
+ <array>
+ <integer>0</integer>
+ </array>
+ </array>
+ <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
+ <string>{{0, 0}, {186, 338}}</string>
+ </dict>
+ <key>PBXTopSmartGroupGIDs</key>
+ <array/>
+ <key>XCIncludePerspectivesSwitch</key>
+ <true/>
+ <key>XCSharingToken</key>
+ <string>com.apple.Xcode.GFSharingToken</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {203, 356}}</string>
+ <key>GroupTreeTableConfiguration</key>
+ <array>
+ <string>MainColumn</string>
+ <real>186</real>
+ </array>
+ <key>RubberWindowFrame</key>
+ <string>295 360 690 397 0 0 1280 778 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXSmartGroupTreeModule</string>
+ <key>Proportion</key>
+ <string>203pt</string>
+ </dict>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CE0B20306471E060097A5F4</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>MyNewFile14.java</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CE0B20406471E060097A5F4</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>MyNewFile14.java</string>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {482, 0}}</string>
+ <key>RubberWindowFrame</key>
+ <string>295 360 690 397 0 0 1280 778 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXNavigatorGroup</string>
+ <key>Proportion</key>
+ <string>0pt</string>
+ </dict>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CE0B20506471E060097A5F4</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Detail</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 5}, {482, 351}}</string>
+ <key>RubberWindowFrame</key>
+ <string>295 360 690 397 0 0 1280 778 </string>
+ </dict>
+ <key>Module</key>
+ <string>XCDetailModule</string>
+ <key>Proportion</key>
+ <string>351pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>482pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Project</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>XCModuleDock</string>
+ <string>PBXSmartGroupTreeModule</string>
+ <string>XCModuleDock</string>
+ <string>PBXNavigatorGroup</string>
+ <string>XCDetailModule</string>
+ </array>
+ <key>TableOfContents</key>
+ <array>
+ <string>6785B4050C0B3E08008277DB</string>
+ <string>1CE0B1FE06471DED0097A5F4</string>
+ <string>6785B4060C0B3E08008277DB</string>
+ <string>1CE0B20306471E060097A5F4</string>
+ <string>1CE0B20506471E060097A5F4</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.default</string>
+ </dict>
+ <dict>
+ <key>ControllerClassBaseName</key>
+ <string></string>
+ <key>IconName</key>
+ <string>WindowOfProject</string>
+ <key>Identifier</key>
+ <string>perspective.morph</string>
+ <key>IsVertical</key>
+ <integer>0</integer>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>BecomeActive</key>
+ <integer>1</integer>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXBottomSmartGroupGIDs</key>
+ <array>
+ <string>1C37FBAC04509CD000000102</string>
+ <string>1C37FAAC04509CD000000102</string>
+ <string>1C08E77C0454961000C914BD</string>
+ <string>1C37FABC05509CD000000102</string>
+ <string>1C37FABC05539CD112110102</string>
+ <string>E2644B35053B69B200211256</string>
+ <string>1C37FABC04509CD000100104</string>
+ <string>1CC0EA4004350EF90044410B</string>
+ <string>1CC0EA4004350EF90041110B</string>
+ </array>
+ <key>PBXProjectModuleGUID</key>
+ <string>11E0B1FE06471DED0097A5F4</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Files</string>
+ <key>PBXProjectStructureProvided</key>
+ <string>yes</string>
+ <key>PBXSmartGroupTreeModuleColumnData</key>
+ <dict>
+ <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
+ <array>
+ <real>186</real>
+ </array>
+ <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
+ <array>
+ <string>MainColumn</string>
+ </array>
+ </dict>
+ <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
+ <dict>
+ <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
+ <array>
+ <string>29B97314FDCFA39411CA2CEA</string>
+ <string>1C37FABC05509CD000000102</string>
+ </array>
+ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
+ <array>
+ <array>
+ <integer>0</integer>
+ </array>
+ </array>
+ <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
+ <string>{{0, 0}, {186, 337}}</string>
+ </dict>
+ <key>PBXTopSmartGroupGIDs</key>
+ <array/>
+ <key>XCIncludePerspectivesSwitch</key>
+ <integer>1</integer>
+ <key>XCSharingToken</key>
+ <string>com.apple.Xcode.GFSharingToken</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {203, 355}}</string>
+ <key>GroupTreeTableConfiguration</key>
+ <array>
+ <string>MainColumn</string>
+ <real>186</real>
+ </array>
+ <key>RubberWindowFrame</key>
+ <string>373 269 690 397 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXSmartGroupTreeModule</string>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Morph</string>
+ <key>PreferredWidth</key>
+ <integer>300</integer>
+ <key>ServiceClasses</key>
+ <array>
+ <string>XCModuleDock</string>
+ <string>PBXSmartGroupTreeModule</string>
+ </array>
+ <key>TableOfContents</key>
+ <array>
+ <string>11E0B1FE06471DED0097A5F4</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.default.short</string>
+ </dict>
+ </array>
+ <key>PerspectivesBarVisible</key>
+ <false/>
+ <key>ShelfIsVisible</key>
+ <false/>
+ <key>SourceDescription</key>
+ <string>file at '/System/Library/PrivateFrameworks/DevToolsInterface.framework/Versions/A/Resources/XCPerspectivesSpecificationMode1.xcperspec'</string>
+ <key>StatusbarIsVisible</key>
+ <true/>
+ <key>TimeStamp</key>
+ <real>0.0</real>
+ <key>ToolbarDisplayMode</key>
+ <integer>1</integer>
+ <key>ToolbarIsVisible</key>
+ <true/>
+ <key>ToolbarSizeMode</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Perspectives</string>
+ <key>UpdateMessage</key>
+ <string>The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature). You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature. Do you wish to update to the latest Workspace defaults for project '%@'?</string>
+ <key>WindowJustification</key>
+ <integer>5</integer>
+ <key>WindowOrderList</key>
+ <array>
+ <string>1C0AD2B3069F1EA900FABCE6</string>
+ <string>6785B4080C0B3E08008277DB</string>
+ <string>/Users/goncalo/src/hdrflow/trunk/app/HDRFlow/HDRFlow.xcodeproj</string>
+ </array>
+ <key>WindowString</key>
+ <string>295 360 690 397 0 0 1280 778 </string>
+ <key>WindowTools</key>
+ <array>
+ <dict>
+ <key>FirstTimeWindowDisplayed</key>
+ <false/>
+ <key>Identifier</key>
+ <string>windowTool.build</string>
+ <key>IsVertical</key>
+ <true/>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CD0528F0623707200166675</string>
+ <key>PBXProjectModuleLabel</key>
+ <string></string>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {500, 218}}</string>
+ <key>RubberWindowFrame</key>
+ <string>316 234 500 500 0 0 1280 778 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXNavigatorGroup</string>
+ <key>Proportion</key>
+ <string>218pt</string>
+ </dict>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>XCMainBuildResultsModuleGUID</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Build</string>
+ <key>XCBuildResultsTrigger_Collapse</key>
+ <integer>1021</integer>
+ <key>XCBuildResultsTrigger_Open</key>
+ <integer>1011</integer>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 223}, {500, 236}}</string>
+ <key>RubberWindowFrame</key>
+ <string>316 234 500 500 0 0 1280 778 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXBuildResultsModule</string>
+ <key>Proportion</key>
+ <string>236pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>459pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Build Results</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXBuildResultsModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <true/>
+ <key>TableOfContents</key>
+ <array>
+ <string>6785B4080C0B3E08008277DB</string>
+ <string>6785B4090C0B3E08008277DB</string>
+ <string>1CD0528F0623707200166675</string>
+ <string>XCMainBuildResultsModuleGUID</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.build</string>
+ <key>WindowString</key>
+ <string>316 234 500 500 0 0 1280 778 </string>
+ <key>WindowToolGUID</key>
+ <string>6785B4080C0B3E08008277DB</string>
+ <key>WindowToolIsVisible</key>
+ <false/>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.debugger</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>Debugger</key>
+ <dict>
+ <key>HorizontalSplitView</key>
+ <dict>
+ <key>_collapsingFrameDimension</key>
+ <real>0.0</real>
+ <key>_indexOfCollapsedView</key>
+ <integer>0</integer>
+ <key>_percentageOfCollapsedView</key>
+ <real>0.0</real>
+ <key>isCollapsed</key>
+ <string>yes</string>
+ <key>sizes</key>
+ <array>
+ <string>{{0, 0}, {317, 164}}</string>
+ <string>{{317, 0}, {377, 164}}</string>
+ </array>
+ </dict>
+ <key>VerticalSplitView</key>
+ <dict>
+ <key>_collapsingFrameDimension</key>
+ <real>0.0</real>
+ <key>_indexOfCollapsedView</key>
+ <integer>0</integer>
+ <key>_percentageOfCollapsedView</key>
+ <real>0.0</real>
+ <key>isCollapsed</key>
+ <string>yes</string>
+ <key>sizes</key>
+ <array>
+ <string>{{0, 0}, {694, 164}}</string>
+ <string>{{0, 164}, {694, 216}}</string>
+ </array>
+ </dict>
+ </dict>
+ <key>LauncherConfigVersion</key>
+ <string>8</string>
+ <key>PBXProjectModuleGUID</key>
+ <string>1C162984064C10D400B95A72</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Debug - GLUTExamples (Underwater)</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>DebugConsoleDrawerSize</key>
+ <string>{100, 120}</string>
+ <key>DebugConsoleVisible</key>
+ <string>None</string>
+ <key>DebugConsoleWindowFrame</key>
+ <string>{{200, 200}, {500, 300}}</string>
+ <key>DebugSTDIOWindowFrame</key>
+ <string>{{200, 200}, {500, 300}}</string>
+ <key>Frame</key>
+ <string>{{0, 0}, {694, 380}}</string>
+ <key>RubberWindowFrame</key>
+ <string>321 238 694 422 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXDebugSessionModule</string>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Debugger</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXDebugSessionModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>1</integer>
+ <key>TableOfContents</key>
+ <array>
+ <string>1CD10A99069EF8BA00B06720</string>
+ <string>1C0AD2AB069F1E9B00FABCE6</string>
+ <string>1C162984064C10D400B95A72</string>
+ <string>1C0AD2AC069F1E9B00FABCE6</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.debug</string>
+ <key>WindowString</key>
+ <string>321 238 694 422 0 0 1440 878 </string>
+ <key>WindowToolGUID</key>
+ <string>1CD10A99069EF8BA00B06720</string>
+ <key>WindowToolIsVisible</key>
+ <integer>0</integer>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.find</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CDD528C0622207200134675</string>
+ <key>PBXProjectModuleLabel</key>
+ <string><No Editor></string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CD0528D0623707200166675</string>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <integer>1</integer>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {781, 167}}</string>
+ <key>RubberWindowFrame</key>
+ <string>62 385 781 470 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXNavigatorGroup</string>
+ <key>Proportion</key>
+ <string>781pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>50%</string>
+ </dict>
+ <dict>
+ <key>BecomeActive</key>
+ <integer>1</integer>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CD0528E0623707200166675</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Project Find</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{8, 0}, {773, 254}}</string>
+ <key>RubberWindowFrame</key>
+ <string>62 385 781 470 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXProjectFindModule</string>
+ <key>Proportion</key>
+ <string>50%</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>428pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Project Find</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXProjectFindModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>1</integer>
+ <key>TableOfContents</key>
+ <array>
+ <string>1C530D57069F1CE1000CFCEE</string>
+ <string>1C530D58069F1CE1000CFCEE</string>
+ <string>1C530D59069F1CE1000CFCEE</string>
+ <string>1CDD528C0622207200134675</string>
+ <string>1C530D5A069F1CE1000CFCEE</string>
+ <string>1CE0B1FE06471DED0097A5F4</string>
+ <string>1CD0528E0623707200166675</string>
+ </array>
+ <key>WindowString</key>
+ <string>62 385 781 470 0 0 1440 878 </string>
+ <key>WindowToolGUID</key>
+ <string>1C530D57069F1CE1000CFCEE</string>
+ <key>WindowToolIsVisible</key>
+ <integer>0</integer>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>MENUSEPARATOR</string>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.debuggerConsole</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>BecomeActive</key>
+ <integer>1</integer>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1C78EAAC065D492600B07095</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Debugger Console</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {440, 358}}</string>
+ <key>RubberWindowFrame</key>
+ <string>650 41 440 400 0 0 1280 1002 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXDebugCLIModule</string>
+ <key>Proportion</key>
+ <string>358pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>358pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Debugger Console</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXDebugCLIModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>1</integer>
+ <key>TableOfContents</key>
+ <array>
+ <string>1C78EAAD065D492600B07095</string>
+ <string>1C78EAAE065D492600B07095</string>
+ <string>1C78EAAC065D492600B07095</string>
+ </array>
+ <key>WindowString</key>
+ <string>650 41 440 400 0 0 1280 1002 </string>
+ </dict>
+ <dict>
+ <key>FirstTimeWindowDisplayed</key>
+ <false/>
+ <key>Identifier</key>
+ <string>windowTool.run</string>
+ <key>IsVertical</key>
+ <true/>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>LauncherConfigVersion</key>
+ <string>3</string>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CD0528B0623707200166675</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Run</string>
+ <key>Runner</key>
+ <dict>
+ <key>HorizontalSplitView</key>
+ <dict>
+ <key>_collapsingFrameDimension</key>
+ <real>0.0</real>
+ <key>_indexOfCollapsedView</key>
+ <integer>0</integer>
+ <key>_percentageOfCollapsedView</key>
+ <real>0.0</real>
+ <key>isCollapsed</key>
+ <string>yes</string>
+ <key>sizes</key>
+ <array>
+ <string>{{0, 0}, {493, 167}}</string>
+ <string>{{0, 176}, {493, 267}}</string>
+ </array>
+ </dict>
+ <key>VerticalSplitView</key>
+ <dict>
+ <key>_collapsingFrameDimension</key>
+ <real>0.0</real>
+ <key>_indexOfCollapsedView</key>
+ <integer>0</integer>
+ <key>_percentageOfCollapsedView</key>
+ <real>0.0</real>
+ <key>isCollapsed</key>
+ <string>yes</string>
+ <key>sizes</key>
+ <array>
+ <string>{{0, 0}, {405, 443}}</string>
+ <string>{{414, 0}, {514, 443}}</string>
+ </array>
+ </dict>
+ </dict>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {459, 159}}</string>
+ <key>RubberWindowFrame</key>
+ <string>316 534 459 200 0 0 1280 778 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXRunSessionModule</string>
+ <key>Proportion</key>
+ <string>159pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>159pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Run Log</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXRunSessionModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <true/>
+ <key>TableOfContents</key>
+ <array>
+ <string>1C0AD2B3069F1EA900FABCE6</string>
+ <string>6785B40A0C0B3E08008277DB</string>
+ <string>1CD0528B0623707200166675</string>
+ <string>6785B40B0C0B3E08008277DB</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.run</string>
+ <key>WindowString</key>
+ <string>316 534 459 200 0 0 1280 778 </string>
+ <key>WindowToolGUID</key>
+ <string>1C0AD2B3069F1EA900FABCE6</string>
+ <key>WindowToolIsVisible</key>
+ <false/>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.scm</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1C78EAB2065D492600B07095</string>
+ <key>PBXProjectModuleLabel</key>
+ <string><No Editor></string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1C78EAB3065D492600B07095</string>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <integer>1</integer>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {452, 0}}</string>
+ <key>RubberWindowFrame</key>
+ <string>743 379 452 308 0 0 1280 1002 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXNavigatorGroup</string>
+ <key>Proportion</key>
+ <string>0pt</string>
+ </dict>
+ <dict>
+ <key>BecomeActive</key>
+ <integer>1</integer>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CD052920623707200166675</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>SCM</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>ConsoleFrame</key>
+ <string>{{0, 259}, {452, 0}}</string>
+ <key>Frame</key>
+ <string>{{0, 7}, {452, 259}}</string>
+ <key>RubberWindowFrame</key>
+ <string>743 379 452 308 0 0 1280 1002 </string>
+ <key>TableConfiguration</key>
+ <array>
+ <string>Status</string>
+ <real>30</real>
+ <string>FileName</string>
+ <real>199</real>
+ <string>Path</string>
+ <real>197.09500122070312</real>
+ </array>
+ <key>TableFrame</key>
+ <string>{{0, 0}, {452, 250}}</string>
+ </dict>
+ <key>Module</key>
+ <string>PBXCVSModule</string>
+ <key>Proportion</key>
+ <string>262pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>266pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>SCM</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXCVSModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>1</integer>
+ <key>TableOfContents</key>
+ <array>
+ <string>1C78EAB4065D492600B07095</string>
+ <string>1C78EAB5065D492600B07095</string>
+ <string>1C78EAB2065D492600B07095</string>
+ <string>1CD052920623707200166675</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.scm</string>
+ <key>WindowString</key>
+ <string>743 379 452 308 0 0 1280 1002 </string>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.breakpoints</string>
+ <key>IsVertical</key>
+ <integer>0</integer>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>BecomeActive</key>
+ <integer>1</integer>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXBottomSmartGroupGIDs</key>
+ <array>
+ <string>1C77FABC04509CD000000102</string>
+ </array>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CE0B1FE06471DED0097A5F4</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Files</string>
+ <key>PBXProjectStructureProvided</key>
+ <string>no</string>
+ <key>PBXSmartGroupTreeModuleColumnData</key>
+ <dict>
+ <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
+ <array>
+ <real>168</real>
+ </array>
+ <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
+ <array>
+ <string>MainColumn</string>
+ </array>
+ </dict>
+ <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
+ <dict>
+ <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
+ <array>
+ <string>1C77FABC04509CD000000102</string>
+ </array>
+ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
+ <array>
+ <array>
+ <integer>0</integer>
+ </array>
+ </array>
+ <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
+ <string>{{0, 0}, {168, 350}}</string>
+ </dict>
+ <key>PBXTopSmartGroupGIDs</key>
+ <array/>
+ <key>XCIncludePerspectivesSwitch</key>
+ <integer>0</integer>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {185, 368}}</string>
+ <key>GroupTreeTableConfiguration</key>
+ <array>
+ <string>MainColumn</string>
+ <real>168</real>
+ </array>
+ <key>RubberWindowFrame</key>
+ <string>315 424 744 409 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXSmartGroupTreeModule</string>
+ <key>Proportion</key>
+ <string>185pt</string>
+ </dict>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CA1AED706398EBD00589147</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Detail</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{190, 0}, {554, 368}}</string>
+ <key>RubberWindowFrame</key>
+ <string>315 424 744 409 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>XCDetailModule</string>
+ <key>Proportion</key>
+ <string>554pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>368pt</string>
+ </dict>
+ </array>
+ <key>MajorVersion</key>
+ <integer>2</integer>
+ <key>MinorVersion</key>
+ <integer>0</integer>
+ <key>Name</key>
+ <string>Breakpoints</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXSmartGroupTreeModule</string>
+ <string>XCDetailModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>1</integer>
+ <key>TableOfContents</key>
+ <array>
+ <string>1CDDB66807F98D9800BB5817</string>
+ <string>1CDDB66907F98D9800BB5817</string>
+ <string>1CE0B1FE06471DED0097A5F4</string>
+ <string>1CA1AED706398EBD00589147</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.breakpoints</string>
+ <key>WindowString</key>
+ <string>315 424 744 409 0 0 1440 878 </string>
+ <key>WindowToolGUID</key>
+ <string>1CDDB66807F98D9800BB5817</string>
+ <key>WindowToolIsVisible</key>
+ <integer>1</integer>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.debugAnimator</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>Module</key>
+ <string>PBXNavigatorGroup</string>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Debug Visualizer</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXNavigatorGroup</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>1</integer>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.debugAnimator</string>
+ <key>WindowString</key>
+ <string>100 100 700 500 0 0 1280 1002 </string>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.bookmarks</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>Module</key>
+ <string>PBXBookmarksModule</string>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Bookmarks</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXBookmarksModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>0</integer>
+ <key>WindowString</key>
+ <string>538 42 401 187 0 0 1280 1002 </string>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.classBrowser</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>BecomeActive</key>
+ <integer>1</integer>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>OptionsSetName</key>
+ <string>Hierarchy, all classes</string>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CA6456E063B45B4001379D8</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Class Browser - NSObject</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>ClassesFrame</key>
+ <string>{{0, 0}, {374, 96}}</string>
+ <key>ClassesTreeTableConfiguration</key>
+ <array>
+ <string>PBXClassNameColumnIdentifier</string>
+ <real>208</real>
+ <string>PBXClassBookColumnIdentifier</string>
+ <real>22</real>
+ </array>
+ <key>Frame</key>
+ <string>{{0, 0}, {630, 331}}</string>
+ <key>MembersFrame</key>
+ <string>{{0, 105}, {374, 395}}</string>
+ <key>MembersTreeTableConfiguration</key>
+ <array>
+ <string>PBXMemberTypeIconColumnIdentifier</string>
+ <real>22</real>
+ <string>PBXMemberNameColumnIdentifier</string>
+ <real>216</real>
+ <string>PBXMemberTypeColumnIdentifier</string>
+ <real>97</real>
+ <string>PBXMemberBookColumnIdentifier</string>
+ <real>22</real>
+ </array>
+ <key>PBXModuleWindowStatusBarHidden2</key>
+ <integer>1</integer>
+ <key>RubberWindowFrame</key>
+ <string>385 179 630 352 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXClassBrowserModule</string>
+ <key>Proportion</key>
+ <string>332pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>332pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Class Browser</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXClassBrowserModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>0</integer>
+ <key>TableOfContents</key>
+ <array>
+ <string>1C0AD2AF069F1E9B00FABCE6</string>
+ <string>1C0AD2B0069F1E9B00FABCE6</string>
+ <string>1CA6456E063B45B4001379D8</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.classbrowser</string>
+ <key>WindowString</key>
+ <string>385 179 630 352 0 0 1440 878 </string>
+ <key>WindowToolGUID</key>
+ <string>1C0AD2AF069F1E9B00FABCE6</string>
+ <key>WindowToolIsVisible</key>
+ <integer>0</integer>
+ </dict>
+ </array>
+</dict>
+</plist>
Added: trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.pbxuser
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.pbxuser (rev 0)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/goncalo.pbxuser 2007-06-10 16:34:50 UTC (rev 148)
@@ -0,0 +1,83 @@
+// !$*UTF8*$!
+{
+ 29B97313FDCFA39411CA2CEA /* Project object */ = {
+ activeBuildConfigurationName = Debug;
+ activeExecutable = 6785B3F80C0B3DEB008277DB /* HDRFlow */;
+ activeTarget = 8D1107260486CEB800E47090 /* HDRFlow */;
+ codeSenseManager = 6785B40D0C0B3E08008277DB /* Code sense */;
+ executables = (
+ 6785B3F80C0B3DEB008277DB /* HDRFlow */,
+ );
+ perUserDictionary = {
+ PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
+ PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
+ PBXFileTableDataSourceColumnWidthsKey = (
+ 20,
+ 243,
+ 20,
+ 48.1626,
+ 43,
+ 43,
+ 20,
+ );
+ PBXFileTableDataSourceColumnsKey = (
+ PBXFileDataSource_FiletypeID,
+ PBXFileDataSource_Filename_ColumnID,
+ PBXFileDataSource_Built_ColumnID,
+ PBXFileDataSource_ObjectSize_ColumnID,
+ PBXFileDataSource_Errors_ColumnID,
+ PBXFileDataSource_Warnings_ColumnID,
+ PBXFileDataSource_Target_ColumnID,
+ );
+ };
+ PBXPerProjectTemplateStateSaveDate = 202063339;
+ PBXWorkspaceStateSaveDate = 202063339;
+ };
+ sourceControlManager = 6785B40C0C0B3E08008277DB /* Source Control */;
+ userBuildSettings = {
+ };
+ };
+ 6785B3F80C0B3DEB008277DB /* HDRFlow */ = {
+ isa = PBXExecutable;
+ activeArgIndex = 2147483647;
+ activeArgIndices = (
+ );
+ argumentStrings = (
+ );
+ autoAttachOnCrash = 1;
+ configStateDict = {
+ };
+ customDataFormattersEnabled = 1;
+ debuggerPlugin = GDBDebugging;
+ disassemblyDisplayState = 0;
+ dylibVariantSuffix = "";
+ enableDebugStr = 1;
+ environmentEntries = (
+ );
+ executableSystemSymbolLevel = 0;
+ executableUserSymbolLevel = 0;
+ libgmallocEnabled = 0;
+ name = HDRFlow;
+ sourceDirectories = (
+ );
+ };
+ 6785B40C0C0B3E08008277DB /* Source Control */ = {
+ isa = PBXSourceControlManager;
+ fallbackIsa = XCSourceControlManager;
+ isSCMEnabled = 0;
+ scmConfiguration = {
+ };
+ scmType = "";
+ };
+ 6785B40D0C0B3E08008277DB /* Code sense */ = {
+ isa = PBXCodeSenseManager;
+ indexTemplatePath = "";
+ };
+ 8D1107260486CEB800E47090 /* HDRFlow */ = {
+ activeExec = 0;
+ executables = (
+ 6785B3F80C0B3DEB008277DB /* HDRFlow */,
+ );
+ };
+}
Added: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj (rev 0)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-06-10 16:34:50 UTC (rev 148)
@@ -0,0 +1,269 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 42;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
+ 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
+ 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
+ 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+ 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+ 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+ 13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+ 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+ 29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
+ 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+ 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+ 32CA4F630368D1EE00C91783 /* HDRFlow_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDRFlow_Prefix.pch; sourceTree = "<group>"; };
+ 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+ 8D1107320486CEB800E47090 /* HDRFlow.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HDRFlow.app; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ 8D11072E0486CEB800E47090 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 080E96DDFE201D6D7F000001 /* Classes */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ name = Classes;
+ sourceTree = "<group>";
+ };
+ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
+ );
+ name = "Linked Frameworks";
+ sourceTree = "<group>";
+ };
+ 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ 29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+ 13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
+ 29B97325FDCFA39411CA2CEA /* Foundation.framework */,
+ );
+ name = "Other Frameworks";
+ sourceTree = "<group>";
+ };
+ 19C28FACFE9D520D11CA2CBB /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 8D1107320486CEB800E47090 /* HDRFlow.app */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ 29B97314FDCFA39411CA2CEA /* HDRFlow */ = {
+ isa = PBXGroup;
+ children = (
+ 080E96DDFE201D6D7F000001 /* Classes */,
+ 29B97315FDCFA39411CA2CEA /* Other Sources */,
+ 29B97317FDCFA39411CA2CEA /* Resources */,
+ 29B97323FDCFA39411CA2CEA /* Frameworks */,
+ 19C28FACFE9D520D11CA2CBB /* Products */,
+ );
+ name = HDRFlow;
+ sourceTree = "<group>";
+ };
+ 29B97315FDCFA39411CA2CEA /* Other Sources */ = {
+ isa = PBXGroup;
+ children = (
+ 32CA4F630368D1EE00C91783 /* HDRFlow_Prefix.pch */,
+ 29B97316FDCFA39411CA2CEA /* main.m */,
+ );
+ name = "Other Sources";
+ sourceTree = "<group>";
+ };
+ 29B97317FDCFA39411CA2CEA /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ 8D1107310486CEB800E47090 /* Info.plist */,
+ 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
+ 29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
+ );
+ name = Resources;
+ sourceTree = "<group>";
+ };
+ 29B97323FDCFA39411CA2CEA /* Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
+ 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
+ );
+ name = Frameworks;
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+ 8D1107260486CEB800E47090 /* HDRFlow */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "HDRFlow" */;
+ buildPhases = (
+ 8D1107290486CEB800E47090 /* Resources */,
+ 8D11072C0486CEB800E47090 /* Sources */,
+ 8D11072E0486CEB800E47090 /* Frameworks */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = HDRFlow;
+ productInstallPath = "$(HOME)/Applications";
+ productName = HDRFlow;
+ productReference = 8D1107320486CEB800E47090 /* HDRFlow.app */;
+ productType = "com.apple.product-type.application";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ 29B97313FDCFA39411CA2CEA /* Project object */ = {
+ isa = PBXProject;
+ buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HDRFlow" */;
+ hasScannedForEncodings = 1;
+ mainGroup = 29B97314FDCFA39411CA2CEA /* HDRFlow */;
+ projectDirPath = "";
+ targets = (
+ 8D1107260486CEB800E47090 /* HDRFlow */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+ 8D1107290486CEB800E47090 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */,
+ 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+ 8D11072C0486CEB800E47090 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 8D11072D0486CEB800E47090 /* main.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+ 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 089C165DFE840E0CC02AAC07 /* English */,
+ );
+ name = InfoPlist.strings;
+ sourceTree = "<group>";
+ };
+ 29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 29B97319FDCFA39411CA2CEA /* English */,
+ );
+ name = MainMenu.nib;
+ sourceTree = "<group>";
+ };
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+ C01FCF4B08A954540054247B /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_MODEL_TUNING = G5;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ INFOPLIST_FILE = Info.plist;
+ INSTALL_PATH = "$(HOME)/Applications";
+ PRODUCT_NAME = HDRFlow;
+ WRAPPER_EXTENSION = app;
+ ZERO_LINK = YES;
+ };
+ name = Debug;
+ };
+ C01FCF4C08A954540054247B /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
+ GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+ GCC_MODEL_TUNING = G5;
+ INFOPLIST_FILE = Info.plist;
+ INSTALL_PATH = "$(HOME)/Applications";
+ PRODUCT_NAME = HDRFlow;
+ WRAPPER_EXTENSION = app;
+ };
+ name = Release;
+ };
+ C01FCF4F08A954540054247B /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ PREBINDING = NO;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ };
+ name = Debug;
+ };
+ C01FCF5008A954540054247B /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ PREBINDING = NO;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "HDRFlow" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ C01FCF4B08A954540054247B /* Debug */,
+ C01FCF4C08A954540054247B /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HDRFlow" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ C01FCF4F08A954540054247B /* Debug */,
+ C01FCF5008A954540054247B /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}
Added: trunk/app/HDRFlow/HDRFlow_Prefix.pch
===================================================================
--- trunk/app/HDRFlow/HDRFlow_Prefix.pch (rev 0)
+++ trunk/app/HDRFlow/HDRFlow_Prefix.pch 2007-06-10 16:34:50 UTC (rev 148)
@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'HDRFlow' target in the 'HDRFlow' project
+//
+
+#ifdef __OBJC__
+ #import <Cocoa/Cocoa.h>
+#endif
Added: trunk/app/HDRFlow/Info.plist
===================================================================
--- trunk/app/HDRFlow/Info.plist (rev 0)
+++ trunk/app/HDRFlow/Info.plist 2007-06-10 16:34:50 UTC (rev 148)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIconFile</key>
+ <string></string>
+ <key>CFBundleIdentifier</key>
+ <string>com.yourcompany.HDRFlow</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+ <key>NSMainNibFile</key>
+ <string>MainMenu</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+</dict>
+</plist>
Added: trunk/app/HDRFlow/main.m
===================================================================
--- trunk/app/HDRFlow/main.m (rev 0)
+++ trunk/app/HDRFlow/main.m 2007-06-10 16:34:50 UTC (rev 148)
@@ -0,0 +1,14 @@
+//
+// main.m
+// HDRFlow
+//
+// Created by Goncalo Carvalho on 28/05/2007.
+// Copyright __MyCompanyName__ 2007. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+int main(int argc, char *argv[])
+{
+ return NSApplicationMain(argc, (const char **) argv);
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-10 14:50:15
|
Revision: 147
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=147&view=rev
Author: glslang
Date: 2007-06-10 07:50:13 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
+umbrella framework
Added Paths:
-----------
trunk/lib/openlibraries/src/umbrella_framework/
trunk/lib/openlibraries/src/umbrella_framework/Makefile.am
trunk/lib/openlibraries/src/umbrella_framework/openlibraries.cpp
trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
Added: trunk/lib/openlibraries/src/umbrella_framework/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/Makefile.am (rev 0)
+++ trunk/lib/openlibraries/src/umbrella_framework/Makefile.am 2007-06-10 14:50:13 UTC (rev 147)
@@ -0,0 +1,32 @@
+
+#
+#
+#
+
+libdir = $(OPENMEDIALIB_LIBPATH)
+
+lib_LTLIBRARIES = libumbrella_framework.la
+
+libumbrella_framework_la_SOURCES = \
+ openlibraries.cpp \
+ openlibraries.hpp
+
+libumbrella_framework_la_CXXFLAGS = \
+ $(OLIB_CXXFLAGS) \
+ $(BOOST_INCLUDE_PATH)
+
+libumbrella_framework_la_LIBADD = \
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
+ $(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la
+
+libumbrella_framework_la_LDFLAGS = \
+ $(OLIB_LDFLAGS) \
+ $(BOOST_LIB_PATH) \
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
+
+library_includedir = $(OPENLIBRARIES_INCLUDEPATH)/openmedialib/ml
+
+library_include_HEADERS = \
+ openlibraries.hpp
+
Property changes on: trunk/lib/openlibraries/src/umbrella_framework/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/openlibraries/src/umbrella_framework/openlibraries.cpp
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/openlibraries.cpp (rev 0)
+++ trunk/lib/openlibraries/src/umbrella_framework/openlibraries.cpp 2007-06-10 14:50:13 UTC (rev 147)
@@ -0,0 +1,9 @@
+
+// umbrella_framework stub.
+
+// Copyright (C) 2007 Goncalo N. M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.openlibraries.org.
+
+#include <openlibraries.hpp>
+
Property changes on: trunk/lib/openlibraries/src/umbrella_framework/openlibraries.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
===================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-10 13:23:32
|
Revision: 146
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=146&view=rev
Author: glslang
Date: 2007-06-10 06:23:30 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
+umbrella framework configuration changes
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/src/Makefile.am
trunk/unity.sh
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-05-30 21:01:08 UTC (rev 145)
+++ trunk/lib/openlibraries/configure.ac 2007-06-10 13:23:30 UTC (rev 146)
@@ -1,6 +1,3 @@
-dnl
-dnl Configure.ac for openlibraries
-dnl
AC_INIT
AC_CONFIG_SRCDIR([src/openobjectlib/sg/core.hpp])
@@ -393,6 +390,7 @@
src/openassetlib/py/Makefile
src/openassetlib/plugins/Makefile
src/openassetlib/plugins/sqlite/Makefile
+src/umbrella_framework/Makefile
media/Makefile
effects/Makefile
test/Makefile
Modified: trunk/lib/openlibraries/src/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/Makefile.am 2007-05-30 21:01:08 UTC (rev 145)
+++ trunk/lib/openlibraries/src/Makefile.am 2007-06-10 13:23:30 UTC (rev 146)
@@ -2,10 +2,11 @@
#
#
-SUBDIRS = \
+SUBDIRS = \
openpluginlib \
openimagelib \
openmedialib \
openeffectslib \
openobjectlib \
- openassetlib
+ openassetlib \
+ umbrella_framework
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-05-30 21:01:08 UTC (rev 145)
+++ trunk/unity.sh 2007-06-10 13:23:30 UTC (rev 146)
@@ -19,7 +19,7 @@
if [ $# -eq "0" ]
then
- echo "usage: `basename $0` options (-evbfiox)"
+ echo "usage: `basename $0` options (-evbfioxu)"
exit 1
fi
@@ -30,12 +30,13 @@
boost_new_version=1_34
build_frameworks=0
+build_umbrella=0
framework_version="A"
install_name_prefix="/Library/Frameworks"
output_directory="."
-while getopts "v:b:efi:o:x:" option
+while getopts "v:b:efi:o:x:u" option
do
case $option in
e ) update_boost_version=1;;
@@ -45,6 +46,7 @@
x ) framework_version="$OPTARG";;
o ) output_directory="$OPTARG";;
i ) install_name_prefix="$OPTARG";;
+ u ) build_umbrella=1;;
esac
done
@@ -122,8 +124,41 @@
{
cp ./lib/openlibraries/Info.plist.template $1.framework/Resources/Info.plist &&
cp ./lib/openlibraries/InfoPlist.strings.template $1.framework/Resources/English.lproj/InfoPlist.strings
+
+ if [ -d "$2/../plugins" ]
+ then plugins=`ls $2/../plugins`
+ for i in $plugins
+ do if [ -d $2/../plugins/$i ]
+ then cp -R $2/../plugins/$i/*.opl $1.framework/Resources
+ fi
+ done
+ fi
}
+make_framework_libs_deps( )
+{
+ deplist="/usr/local/lib"
+ for i in $deplist
+ do libs=`ls $1.framework/Libraries`
+ for j in $libs
+ do if [ ! -L $1.framework/Versions/$framework_version/Libraries/$j ]
+ then depname=`otool -L $1.framework/Libraries/$j | grep $i | cut -d ' ' -f 1`
+ for k in $depname
+ do base=`basename $k`
+ if [ ! -e $1.framework/Versions/$framework_version/Libraries/$base ]
+ then cp $k $1.framework/Versions/$framework_version/Libraries
+ install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$base \
+ $1.framework/Versions/$framework_version/Libraries/$base
+ fi
+ install_name_tool -change $k \
+ $install_name_prefix/$1.framework/Versions/$framework_version/Libraries/$base \
+ $1.framework/Versions/$framework_version/Libraries/$j
+ done
+ fi
+ done
+ done
+}
+
make_framework_plugins_deps( )
{
deplist="GLEW boost /usr/local/lib"
@@ -196,7 +231,7 @@
esac
fi
done
- done
+ done
}
make_framework( )
@@ -204,13 +239,57 @@
make_framework_dir $1 &&
make_framework_headers $2 $1 &&
make_framework_libs $1 $2 &&
- make_framework_resources $1
+ make_framework_resources $1 $2
make_framework_deps $1
make_framework_plugins $2 $1
make_framework_plugins_deps $1
make_framework_interdeps $1
+ make_framework_libs_deps $1
}
+update_umbrella_framework_install_names( )
+{
+ echo "not implemented"
+}
+
+make_umbrella_framework( )
+{
+ rm -rf "./HDRFlow.framework"
+ make_framework "HDRFlow" "./lib/openlibraries/src/umbrella_framework"
+
+ framework_dir="$output_directory/HDRFlow.framework"
+ mkdir -p "$framework_dir/Versions/$framework_version/Frameworks"
+ ln -sf "Versions/Current/Frameworks" "$framework_dir/Frameworks"
+
+ cp -R "./HDRFlowPlugin.framework" "$framework_dir/Versions/$framework_version/Frameworks"
+ cp -R "./HDRFlowImage.framework" "$framework_dir/Versions/$framework_version/Frameworks"
+ cp -R "./HDRFlowMedia.framework" "$framework_dir/Versions/$framework_version/Frameworks"
+
+ deplist="openpluginlib_pl openimagelib_il openmedialib_ml"
+ for i in $deplist
+ do depname=`otool -L HDRFlow.framework/HDRFlow | grep $i | cut -d ' ' -f 1`
+ if [ ! -z $depname ]
+ then case $i in
+ openpluginlib_pl )
+ install_name_tool -change $depname \
+ "$install_name_prefix"/HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Versions/$framework_version/HDRFlowPlugin \
+ ./HDRFlow.framework/Versions/$framework_version/HDRFlow
+ ;;
+ openimagelib_il )
+ install_name_tool -change $depname \
+ "$install_name_prefix"/HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowImage.framework/Versions/$framework_version/HDRFlowImage \
+ ./HDRFlow.framework/Versions/$framework_version/HDRFlow
+ ;;
+ openmedialib_ml )
+ install_name_tool -change $depname \
+ "$install_name_prefix"/HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowMedia.framework/Versions/$framework_version/HDRFlowMedia \
+ ./HDRFlow.framework/Versions/$framework_version/HDRFlow
+ ;;
+ esac
+ fi
+ done
+}
+
if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ]
then
echo "Building OS/X Frameworks..."
@@ -222,6 +301,13 @@
echo -n " HDRFlowMedia..." &&
make_framework "HDRFlowMedia" "./lib/openlibraries/src/openmedialib/ml"
check_status $?
+
+ if [ "$build_umbrella" -eq 1 ]
+ then echo " Building Umbrella Framework..."
+ echo -n " HDRFlow..."
+ make_umbrella_framework
+ check_status $?
+ fi
fi
exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-05-30 21:01:19
|
Revision: 145
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=145&view=rev
Author: glslang
Date: 2007-05-30 14:01:08 -0700 (Wed, 30 May 2007)
Log Message:
-----------
+ improvements to the framework generation process. still missing 3rd party libraries deps
Modified Paths:
--------------
trunk/unity.sh
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-05-27 19:53:26 UTC (rev 144)
+++ trunk/unity.sh 2007-05-30 21:01:08 UTC (rev 145)
@@ -64,11 +64,13 @@
framework_dir="$output_directory/$1.framework"
mkdir -p "$framework_dir" &&
mkdir -p "$framework_dir/Versions/$framework_version/Headers" &&
+ mkdir -p "$framework_dir/Versions/$framework_version/PlugIns" &&
mkdir -p "$framework_dir/Versions/$framework_version/Resources/English.lproj/Documentation" &&
mkdir -p "$framework_dir/Versions/$framework_version/Resources/Portuguese.lproj/Documentation" &&
mkdir -p "$framework_dir/Versions/$framework_version/Libraries" &&
ln -sf "$framework_version" "$framework_dir/Versions/Current" &&
ln -sf "Versions/Current/Headers" "$framework_dir/Headers" &&
+ ln -sf "Versions/Current/PlugIns" "$framework_dir/PlugIns" &&
ln -sf "Versions/Current/Resources" "$framework_dir/Resources" &&
ln -sf "Versions/Current/Libraries" "$framework_dir/Libraries"
}
@@ -122,11 +124,81 @@
cp ./lib/openlibraries/InfoPlist.strings.template $1.framework/Resources/English.lproj/InfoPlist.strings
}
+make_framework_plugins_deps( )
+{
+ deplist="GLEW boost /usr/local/lib"
+ for i in $deplist
+ do plugins=`ls $1.framework/PlugIns`
+ for j in $plugins
+ do if [ ! -L $1.framework/PlugIns/$j ]
+ then install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$j \
+ $1.framework/Versions/$framework_version/PlugIns/$j
+ depname=`otool -L $1.framework/PlugIns/$j | grep $i | cut -d ' ' -f 1`
+ for k in $depname
+ do depdir=`dirname $k`
+ libname="$k"
+ if [ $depdir == "." ]
+ then libname="/usr/local/lib/$depdir/$k"
+ fi
+ base=`basename $k`
+ if [ ! -e $1.framework/Versions/$framework_version/Libraries/$base ]
+ then
+ if [ -e $libname ]
+ then cp $libname $1.framework/Versions/$framework_version/Libraries
+ install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$base \
+ $1.framework/Versions/$framework_version/Libraries/$base
+ install_name_tool -change $k \
+ $install_name_prefix/$1.framework/Versions/$framework_version/Libraries/$base $1.framework/$1
+ fi
+ fi
+ install_name_tool -change $k \
+ $install_name_prefix/$1.framework/Versions/$framework_version/Libraries/$base \
+ $1.framework/Versions/$framework_version/PlugIns/$j
+ done
+ fi
+ done
+ done
+}
+
make_framework_plugins( )
{
- echo $1
+ if [ -d "$1/../plugins" ]
+ then plugins=`ls $1/../plugins`
+ for i in $plugins
+ do if [ -d $1/../plugins/$i/.libs ]
+ then cp -R $1/../plugins/$i/.libs/*.dylib $2.framework/PlugIns
+ fi
+ done
+ fi
}
+make_framework_interdeps( )
+{
+ deplist="openpluginlib_pl openimagelib_il openmedialib_ml"
+ for i in $deplist
+ do plugins=`ls $1.framework/PlugIns/*.dylib 2> /dev/null`
+ for j in $plugins
+ do depname=`otool -L $j | grep $i | cut -d ' ' -f 1`
+ if [ ! -z $depname ]
+ then case $i in
+ openpluginlib_pl )
+ install_name_tool -change $depname \
+ $install_name_prefix/HDRFlowPlugin.framework/Versions/$framework_version/HDRFlowPlugin $j
+ ;;
+ openimagelib_il )
+ install_name_tool -change $depname \
+ $install_name_prefix/HDRFlowImage.framework/Versions/$framework_version/HDRFlowImage $j
+ ;;
+ openmedialib_ml )
+ install_name_tool -change $depname \
+ $install_name_prefix/HDRFlowMedia.framework/Versions/$framework_version/HDRFlowMedia $j
+ ;;
+ esac
+ fi
+ done
+ done
+}
+
make_framework( )
{
make_framework_dir $1 &&
@@ -134,6 +206,9 @@
make_framework_libs $1 $2 &&
make_framework_resources $1
make_framework_deps $1
+ make_framework_plugins $2 $1
+ make_framework_plugins_deps $1
+ make_framework_interdeps $1
}
if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-05-27 19:53:28
|
Revision: 144
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=144&view=rev
Author: glslang
Date: 2007-05-27 12:53:26 -0700 (Sun, 27 May 2007)
Log Message:
-----------
+initial header updates to allow for framework integration
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-05-27 17:50:58 UTC (rev 143)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-05-27 19:53:26 UTC (rev 144)
@@ -17,10 +17,17 @@
#include <functional>
#include <vector>
+#ifndef FMWK
#include <openpluginlib/pl/config.hpp>
#include <openpluginlib/pl/discovery_traits.hpp>
#include <openpluginlib/pl/openplugin.hpp>
#include <openpluginlib/pl/string.hpp>
+#else
+#include <HDRFlowPlugin/config.hpp>
+#include <HDRFlowPlugin/discovery_traits.hpp>
+#include <HDRFlowPlugin/openplugin.hpp>
+#include <HDRFlowPlugin/string.hpp>
+#endif
namespace olib { namespace openpluginlib {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-05-27 17:50:59
|
Revision: 143
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=143&view=rev
Author: glslang
Date: 2007-05-27 10:50:58 -0700 (Sun, 27 May 2007)
Log Message:
-----------
+ eol property to native
Property Changed:
----------------
trunk/lib/openlibraries/Info.plist.template
Property changes on: trunk/lib/openlibraries/Info.plist.template
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-05-27 17:42:13
|
Revision: 142
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=142&view=rev
Author: glslang
Date: 2007-05-27 10:42:12 -0700 (Sun, 27 May 2007)
Log Message:
-----------
+Initial Framework support
Modified Paths:
--------------
trunk/unity.sh
Added Paths:
-----------
trunk/lib/openlibraries/Info.plist.template
trunk/lib/openlibraries/InfoPlist.strings.template
Added: trunk/lib/openlibraries/Info.plist.template
===================================================================
--- trunk/lib/openlibraries/Info.plist.template (rev 0)
+++ trunk/lib/openlibraries/Info.plist.template 2007-05-27 17:42:12 UTC (rev 142)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleName</key>
+ <string>HDRFlow OpenLibraries</string>
+ <key>CFBundleIconFile</key>
+ <string></string>
+ <key>CFBundleIdentifier</key>
+ <string>com.cryogenicgraphics.openlibraries</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>FMWK</string>
+ <key>CFBundleSignature</key>
+ <string>FLOW</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+ <key>NSPrincipalClass</key>
+ <string></string>
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright (c) VM Inc. Parts Copyright (c) Goncalo de Carvalho</string>
+ <key>CFBundleGetInfoString</key>
+ <string>HDRFlow OpenLibraries - A framework for rich-media applications.</string>
+</dict>
+</plist>
Added: trunk/lib/openlibraries/InfoPlist.strings.template
===================================================================
(Binary files differ)
Property changes on: trunk/lib/openlibraries/InfoPlist.strings.template
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-05-26 19:00:16 UTC (rev 141)
+++ trunk/unity.sh 2007-05-27 17:42:12 UTC (rev 142)
@@ -1,24 +1,50 @@
#!/bin/sh -x
+# Copyright (c) 2007 Goncalo de Carvalho.
+# Released under the GPLv2 or later.
# Unification of build and distribution:
# recurses into lib and app directories, building each in turn.
-# updates Boost version in VC8 project files.
+# updates Boost version in VC project files.
+# builds OS/X frameworks
+check_status( )
+{
+ if [ $1 = 0 ]
+ then
+ echo " succeeded."
+ else
+ echo " failed. Aborting..."
+ exit 1
+ fi
+}
+
if [ $# -eq "0" ]
then
- echo "usage: `basename $0` options (-evb)"
+ echo "usage: `basename $0` options (-evbfiox)"
exit 1
fi
+PLATFORM=`uname -s`
+
update_boost_version=0
boost_old_version=1_33_1
boost_new_version=1_34
-while getopts "v:b:e" option
+build_frameworks=0
+framework_version="A"
+install_name_prefix="/Library/Frameworks"
+
+output_directory="."
+
+while getopts "v:b:efi:o:x:" option
do
case $option in
e ) update_boost_version=1;;
v ) boost_old_version="$OPTARG";;
b ) boost_new_version="$OPTARG";;
+ f ) build_frameworks=1;;
+ x ) framework_version="$OPTARG";;
+ o ) output_directory="$OPTARG";;
+ i ) install_name_prefix="$OPTARG";;
esac
done
@@ -29,9 +55,98 @@
find . -type f -name '*.vcproj' -print | while read i
do cp $i $i.unity.bak &&
sed -e "s|boost-$boost_old_version|boost-$boost_new_version|g" -e "s|$boost_old_version.lib|$boost_new_version.lib|g" $i.unity.bak > $i &&
- rm $i.unity.bak
+ rm -f $i.unity.bak
done
fi
+make_framework_dir( )
+{
+ framework_dir="$output_directory/$1.framework"
+ mkdir -p "$framework_dir" &&
+ mkdir -p "$framework_dir/Versions/$framework_version/Headers" &&
+ mkdir -p "$framework_dir/Versions/$framework_version/Resources/English.lproj/Documentation" &&
+ mkdir -p "$framework_dir/Versions/$framework_version/Resources/Portuguese.lproj/Documentation" &&
+ mkdir -p "$framework_dir/Versions/$framework_version/Libraries" &&
+ ln -sf "$framework_version" "$framework_dir/Versions/Current" &&
+ ln -sf "Versions/Current/Headers" "$framework_dir/Headers" &&
+ ln -sf "Versions/Current/Resources" "$framework_dir/Resources" &&
+ ln -sf "Versions/Current/Libraries" "$framework_dir/Libraries"
+}
+
+make_framework_headers( )
+{
+ tl=`cat -n $1/Makefile.am | cut -f 1 | tail -n 1` &&
+ hl=`cat -n $1/Makefile.am | grep HEADERS | cut -f 1` &&
+ headers=`cat $1/Makefile.am | tail -n $((tl-hl)) | cut -f 2` &&
+ for i in $headers
+ do basedir=`dirname $1/$i | sed -e "s|$1||g"` &&
+ mkdir -p $2.framework/Versions/Current/Headers/$basedir &&
+ cp -R $1/$i $2.framework/Versions/Current/Headers/$basedir
+ done
+}
+
+make_framework_libs( )
+{
+ libs=`ls $2/.libs/*.?.dylib`
+ for i in $libs
+ do if [ ! -L $i ]
+ then ln -sf Versions/Current/$1 $1.framework/$1 &&
+ cp $i $1.framework/Versions/Current/$1 &&
+ install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$1 $1.framework/$1
+ fi
+ done
+}
+
+make_framework_deps( )
+{
+ deplist="GLEW boost"
+ for i in $deplist
+ do depname=`otool -L $1.framework/$1 | grep $i | cut -d ' ' -f 1`
+ for j in $depname
+ do depdir=`dirname $j`
+ libname="$j"
+ if [ $depdir == "." ]
+ then libname="/usr/local/lib/$depdir/$j"
+ fi
+ base=`basename $j`
+ cp $libname $1.framework/Versions/$framework_version/Libraries
+ install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$base $1.framework/Versions/$framework_version/Libraries/$base
+ install_name_tool -change $j $install_name_prefix/$1.framework/Versions/$framework_version/Libraries/$base $1.framework/$1
+ done
+ done
+}
+
+make_framework_resources( )
+{
+ cp ./lib/openlibraries/Info.plist.template $1.framework/Resources/Info.plist &&
+ cp ./lib/openlibraries/InfoPlist.strings.template $1.framework/Resources/English.lproj/InfoPlist.strings
+}
+
+make_framework_plugins( )
+{
+ echo $1
+}
+
+make_framework( )
+{
+ make_framework_dir $1 &&
+ make_framework_headers $2 $1 &&
+ make_framework_libs $1 $2 &&
+ make_framework_resources $1
+ make_framework_deps $1
+}
+
+if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ]
+then
+ echo "Building OS/X Frameworks..."
+
+ echo " HDRFlowPlugin..." &&
+ make_framework "HDRFlowPlugin" "./lib/openlibraries/src/openpluginlib/pl" &&
+ echo " HDRFlowImage..." &&
+ make_framework "HDRFlowImage" "./lib/openlibraries/src/openimagelib/il" &&
+ echo -n " HDRFlowMedia..." &&
+ make_framework "HDRFlowMedia" "./lib/openlibraries/src/openmedialib/ml"
+ check_status $?
+fi
+
exit 0
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-05-26 19:00:18
|
Revision: 141
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=141&view=rev
Author: glslang
Date: 2007-05-26 12:00:16 -0700 (Sat, 26 May 2007)
Log Message:
-----------
+formatting changes to conform to unity script parsing
Modified Paths:
--------------
trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am
Modified: trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am 2007-05-23 20:50:56 UTC (rev 140)
+++ trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am 2007-05-26 19:00:16 UTC (rev 141)
@@ -14,13 +14,11 @@
openmedialib_plugin.hpp \
store.hpp \
utilities.cpp \
- utilities.hpp \
- # end
+ utilities.hpp
libopenmedialib_ml_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH) \
- # end
+ $(BOOST_INCLUDE_PATH)
libopenmedialib_ml_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
@@ -29,15 +27,13 @@
library_includedir = $(OPENLIBRARIES_INCLUDEPATH)/openmedialib/ml
-library_include_HEADERS = \
- audio.hpp \
- config.hpp \
- filter.hpp \
- frame.hpp \
- input.hpp \
- ml.hpp \
+library_include_HEADERS = \
+ audio.hpp \
+ config.hpp \
+ filter.hpp \
+ frame.hpp \
+ input.hpp \
+ ml.hpp \
openmedialib_plugin.hpp \
- store.hpp \
- utilities.hpp \
- # end
-
+ store.hpp \
+ utilities.hpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-05-23 20:50:57
|
Revision: 140
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=140&view=rev
Author: glslang
Date: 2007-05-23 13:50:56 -0700 (Wed, 23 May 2007)
Log Message:
-----------
+ compilation fixes
+ virtual address space of 3GB on win
Modified Paths:
--------------
trunk/lib/extras/extras_vc8.sln
trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj
trunk/lib/extras/src/raw/dcraw_vc8.vcproj
trunk/lib/extras/src/raw/raw_vc8.vcproj
Modified: trunk/lib/extras/extras_vc8.sln
===================================================================
--- trunk/lib/extras/extras_vc8.sln 2007-05-23 20:40:55 UTC (rev 139)
+++ trunk/lib/extras/extras_vc8.sln 2007-05-23 20:50:56 UTC (rev 140)
@@ -18,36 +18,22 @@
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
Multi-threaded Release DLL|Win32 = Multi-threaded Release DLL|Win32
- Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj 2007-05-23 20:40:55 UTC (rev 139)
+++ trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj 2007-05-23 20:50:56 UTC (rev 140)
@@ -64,6 +64,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\hdrflow_panoramic-vc80-d-0_1_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
@@ -145,6 +146,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\hdrflow_panoramic-vc80-r-0_1_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
Modified: trunk/lib/extras/src/raw/dcraw_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/raw/dcraw_vc8.vcproj 2007-05-23 20:40:55 UTC (rev 139)
+++ trunk/lib/extras/src/raw/dcraw_vc8.vcproj 2007-05-23 20:50:56 UTC (rev 140)
@@ -63,6 +63,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libjpeg.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""C:\Program Files\HDR\lib""
@@ -143,6 +144,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libjpeg.lib"
LinkIncremental="1"
AdditionalLibraryDirectories=""C:\Program Files\HDR\lib""
Modified: trunk/lib/extras/src/raw/raw_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/raw/raw_vc8.vcproj 2007-05-23 20:40:55 UTC (rev 139)
+++ trunk/lib/extras/src/raw/raw_vc8.vcproj 2007-05-23 20:50:56 UTC (rev 140)
@@ -64,9 +64,10 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\hdrflow_raw-vc80-d-0_1_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -145,9 +146,10 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\hdrflow_raw-vc80-r-0_1_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-05-23 20:41:16
|
Revision: 139
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=139&view=rev
Author: glslang
Date: 2007-05-23 13:40:55 -0700 (Wed, 23 May 2007)
Log Message:
-----------
+ code cleanups
+ virtual address space of 3GB on win
Modified Paths:
--------------
trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/py/il.cpp
Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-05-23 20:40:55 UTC (rev 139)
@@ -202,20 +202,6 @@
</References>
<Files>
<Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\il.cpp"
- >
- </File>
- <File
- RelativePath=".\utility.cpp"
- >
- </File>
- </Filter>
- <Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
@@ -267,6 +253,20 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\il.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\utility.cpp"
+ >
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
Modified: trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp 2007-05-23 19:36:34 UTC (rev 138)
+++ trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp 2007-05-23 20:40:55 UTC (rev 139)
@@ -22,6 +22,8 @@
virtual bool store( const boost::filesystem::path& path, const image_type_ptr& image ) = 0;
};
+typedef boost::shared_ptr<openimagelib_plugin> openimagelib_plugin_ptr;
+
} } }
#endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2007-05-23 20:40:55 UTC (rev 139)
@@ -64,6 +64,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
ShowProgress="0"
OutputFile="$(OutDir)\openimagelib_dpx-vc80-d-0_4_0.dll"
LinkIncremental="2"
Modified: trunk/lib/openlibraries/src/openimagelib/py/il.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/il.cpp 2007-05-23 19:36:34 UTC (rev 138)
+++ trunk/lib/openlibraries/src/openimagelib/py/il.cpp 2007-05-23 20:40:55 UTC (rev 139)
@@ -7,7 +7,6 @@
#include <openpluginlib/py/python.hpp>
#include <openimagelib/il/openimagelib_plugin.hpp>
-#include <openimagelib/plugins/tga/tga_plugin.hpp>
#include <openimagelib/py/py.hpp>
namespace fs = boost::filesystem;
@@ -19,7 +18,7 @@
il::image_type_ptr load_image( const opl::opl_ptr& ptr, const std::string& path )
{
- boost::shared_ptr<il::openimagelib_plugin> plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( ptr );
+ il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( ptr );
if( !plug )
return il::image_type_ptr( );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-05-23 19:36:36
|
Revision: 138
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=138&view=rev
Author: glslang
Date: 2007-05-23 12:36:34 -0700 (Wed, 23 May 2007)
Log Message:
-----------
+ plugins cleanups
+ enable virtual address space of 3GB on win
Modified Paths:
--------------
trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj
trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj
trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap_vc8.vcproj
trunk/lib/openlibraries/test/openmedialib/player/player_vc8.vcproj
trunk/lib/openlibraries/test/openmedialib/store/store_vc8.vcproj
trunk/lib/openlibraries/test/openobjectlib/GL/multipass_draw/multipass_draw_vc8.vcproj
trunk/lib/openlibraries/test/openobjectlib/GL/noise_volume/noise_volume_vc8.vcproj
trunk/lib/openlibraries/test/openobjectlib/GL/obj_draw/obj_draw_vc8.vcproj
trunk/lib/openlibraries/test/openobjectlib/GL/texture_draw/texture_draw_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/discovery/discovery_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/enumerate/enumerate_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/gpu_timer_query/gpu_timer_query_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/initialization/initialization_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/pcos/key/key_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/pcos/property/property_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/pcos/property_container/property_container_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/pcos/subject-observer/subject-observer_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/rdtsc/rdtsc_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/sleep/sleep_vc8.vcproj
Removed Paths:
-------------
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp
Modified: trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openassetlib_al-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName);$(SolutionDir)\src\openobjectlib\sg\$(ConfigurationName)"
@@ -148,6 +149,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)/openassetlib_al-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName);$(SolutionDir)\src\openobjectlib\sg\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -65,6 +65,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="sqlite-vc71-d-3_2_7.lib"
OutputFile="$(OutDir)\openassetlib_sqlite-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -147,6 +148,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="sqlite-vc71-r-3_2_7.lib"
OutputFile="$(OutDir)\openassetlib_sqlite-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -64,6 +64,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
OutputFile="$(OutDir)\openassetlib.pyd"
LinkIncremental="2"
@@ -146,6 +147,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
OutputFile="$(OutDir)\openassetlib.pyd"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -65,6 +65,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half_dll_d.lib IlmImf_dll_d.lib Iex_dll_d.lib"
OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -148,6 +149,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half_dll.lib IlmImf_dll.lib Iex_dll.lib"
OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -71,6 +71,7 @@
<Tool
Name="VCLinkerTool"
UseUnicodeResponseFiles="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)/openimagelib_il-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
@@ -159,6 +160,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)/openimagelib_il-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -67,6 +67,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_3D_lightmap-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -150,6 +151,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_3D_lightmap-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -69,6 +69,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
OutputFile="$(OutDir)/openimagelib_bmp-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -157,6 +158,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
OutputFile="$(OutDir)/openimagelib_bmp-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -109,15 +109,16 @@
il::image_type_ptr ddsd_pixelformat_to_image_type( DDSURFACEDESC2 ddsd )
{
- #define MAKEFOURCC( ch0, ch1, ch2, ch3 ) \
+# ifndef MAKEFOURCC
+# define MAKEFOURCC( ch0, ch1, ch2, ch3 ) \
( ( unsigned long ) ( unsigned char ) ( ch0 ) | \
( ( unsigned long ) ( unsigned char ) ( ch1 ) << 8 ) | \
( ( unsigned long ) ( unsigned char ) ( ch2 ) << 16 ) | \
( ( unsigned long ) ( unsigned char ) ( ch3 ) << 24 ) )
+# endif
+# define DDPF_FOURCC 0x00000004
+# define DDSCAPS2_CUBEMAP 0x00000200
- #define DDPF_FOURCC 0x00000004
- #define DDSCAPS2_CUBEMAP 0x00000200
-
if( ddsd.ddpfPixelFormat.dwFlags & DDPF_FOURCC )
{
typedef il::image<unsigned char, il::dxt1> dxt1_image_type;
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -67,6 +67,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_dds-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -151,6 +152,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_dds-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half_dll_d.lib IlmImf_dll_d.lib Iex_dll_d.lib"
OutputFile="$(OutDir)\openimagelib_exr-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -149,6 +150,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half_dll.lib IlmImf_dll.lib Iex_dll.lib"
OutputFile="$(OutDir)\openimagelib_exr-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
OutputFile="$(OutDir)\openimagelib_gdi-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -149,6 +150,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
OutputFile="$(OutDir)\openimagelib_gdi-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -69,6 +69,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_hdr-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -153,6 +154,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_hdr-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -69,6 +69,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libjpeg.lib libjpeghdr.lib"
OutputFile="$(OutDir)/openimagelib_jpg-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -158,6 +159,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libjpeg.lib libjpeghdr.lib"
OutputFile="$(OutDir)/openimagelib_jpg-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libpng13.lib zdll.lib"
OutputFile="$(OutDir)\openimagelib_png-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -151,6 +152,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libpng13.lib zdll.lib"
OutputFile="$(OutDir)\openimagelib_png-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_psd-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -149,6 +150,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_psd-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="qtmlClient.lib"
OutputFile="$(OutDir)\openimagelib_quicktime-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -150,6 +151,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="qtmlClient.lib"
OutputFile="$(OutDir)\openimagelib_quicktime-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am 2007-05-23 19:36:34 UTC (rev 138)
@@ -8,15 +8,11 @@
lib_LTLIBRARIES = libopenimagelib_sgi.la
libopenimagelib_sgi_la_SOURCES = \
- config.hpp \
- sgi.cpp \
- sgi_plugin.hpp \
sgi_plugin.cpp
libopenimagelib_sgi_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH) \
- # end
+ $(BOOST_INCLUDE_PATH)
libopenimagelib_sgi_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/config.hpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/config.hpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -1,25 +0,0 @@
-
-// SGI - A SGI plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef SGI_CONFIG_INC_
-#define SGI_CONFIG_INC_
-
-#ifdef WIN32
- #ifdef SGI_EXPORTS
- #define SGI_DECLSPEC __declspec( dllexport )
- #else
- #define SGI_DECLSPEC __declspec( dllimport )
- #endif // SGI_EXPORTS
-#else
- #ifdef SGI_EXPORTS
- #define SGI_DECLSPEC extern
- #else
- #define SGI_DECLSPEC
- #endif // SGI_EXPORTS
-#endif // WIN32
-
-#endif // SGI_CONFIG_INC_
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi.cpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi.cpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -1,33 +0,0 @@
-
-// SGI - An SGI plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/sgi/sgi_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace SGI = olib::openimagelib::plugins::SGI;
-
-extern "C"
-{
- SGI_DECLSPEC bool openplugin_init( void )
- {
- return true;
- }
-
- SGI_DECLSPEC bool openplugin_uninit( void )
- {
- return true;
- }
-
- SGI_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
- {
- *plug = new SGI::SGI_plugin;
- return true;
- }
-
- SGI_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
- { delete static_cast<SGI::SGI_plugin*>( plug ); }
-}
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -11,12 +11,13 @@
#include <boost/filesystem/fstream.hpp>
-#include <openimagelib/plugins/sgi/sgi_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
namespace il = olib::openimagelib::il;
+namespace pl = olib::openpluginlib;
namespace fs = boost::filesystem;
-namespace olib { namespace openimagelib { namespace plugins { namespace SGI {
+namespace olib { namespace openimagelib { namespace il {
namespace
{
@@ -277,10 +278,47 @@
}
}
-il::image_type_ptr SGI_plugin::load( const fs::path& path )
-{ return load_sgi( path ); }
+class sgi_plugin : public il::openimagelib_plugin
+{
+public:
+ virtual il::image_type_ptr load( const fs::path& path )
+ { return load_sgi( path ); }
+
+ virtual bool store( const fs::path&, const il::image_type_ptr& )
+ { return false; }
+};
-bool SGI_plugin::store( const fs::path& path, const il::image_type_ptr& )
-{ return false; }
+} } }
-} } } }
+extern "C"
+{
+ IL_DECLSPEC bool openplugin_init( void )
+ {
+ return true;
+ }
+
+ IL_DECLSPEC bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ IL_DECLSPEC bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new il::sgi_plugin;
+ return true;
+ }
+
+ IL_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
+ { delete static_cast<il::sgi_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
+
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.hpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.hpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -1,27 +0,0 @@
-
-// SGI - A SGI plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef SGI_PLUGIN_INC_
-#define SGI_PLUGIN_INC_
-
-#include <boost/filesystem/path.hpp>
-
-#include <openimagelib/plugins/sgi/config.hpp>
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace olib { namespace openimagelib { namespace plugins { namespace SGI {
-
-class SGI_DECLSPEC SGI_plugin : public olib::openimagelib::il::openimagelib_plugin
-{
-public:
- virtual il::image_type_ptr load( const boost::filesystem::path& path );
- virtual bool store( const boost::filesystem::path& path, const il::image_type_ptr& image );
-};
-
-} } } }
-
-#endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SGI_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_sgi-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -125,7 +126,7 @@
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SGI_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="0"
@@ -149,6 +150,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_sgi-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -194,10 +196,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\sgi.cpp"
- >
- </File>
- <File
RelativePath=".\sgi_plugin.cpp"
>
</File>
@@ -207,14 +205,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
- <File
- RelativePath=".\config.hpp"
- >
- </File>
- <File
- RelativePath=".\sgi_plugin.hpp"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am 2007-05-23 19:36:34 UTC (rev 138)
@@ -8,9 +8,6 @@
lib_LTLIBRARIES = libopenimagelib_tga.la
libopenimagelib_tga_la_SOURCES = \
- config.hpp \
- tga.cpp \
- tga_plugin.hpp \
tga_plugin.cpp
libopenimagelib_tga_la_CXXFLAGS = \
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/tga/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/config.hpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/config.hpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -1,25 +0,0 @@
-
-// TGA - An TGA plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef TGA_CONFIG_INC_
-#define TGA_CONFIG_INC_
-
-#ifdef WIN32
- #ifdef TGA_EXPORTS
- #define TGA_DECLSPEC __declspec( dllexport )
- #else
- #define TGA_DECLSPEC __declspec( dllimport )
- #endif // TGA_EXPORTS
-#else
- #ifdef TGA_EXPORTS
- #define TGA_DECLSPEC extern
- #else
- #define TGA_DECLSPEC
- #endif // TGA_EXPORTS
-#endif // WIN32
-
-#endif // TGA_CONFIG_INC_
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga.cpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga.cpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -1,33 +0,0 @@
-
-// TGA - An TGA plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/tga/tga_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace TGA = olib::openimagelib::plugins::TGA;
-
-extern "C"
-{
- TGA_DECLSPEC bool openplugin_init( void )
- {
- return true;
- }
-
- TGA_DECLSPEC bool openplugin_uninit( void )
- {
- return true;
- }
-
- TGA_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
- {
- *plug = new TGA::TGA_plugin;
- return true;
- }
-
- TGA_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
- { delete static_cast<TGA::TGA_plugin*>( plug ); }
-}
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -7,7 +7,6 @@
#ifdef WIN32
#include <windows.h>
-#include <gdiplus.h>
#endif // WIN32
#include <vector>
@@ -16,13 +15,13 @@
#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/path.hpp>
-#include <openimagelib/plugins/tga/tga_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
-namespace fs = boost::filesystem;
-namespace il = olib::openimagelib::il;
-namespace opl = olib::openpluginlib;
+namespace fs = boost::filesystem;
+namespace il = olib::openimagelib::il;
+namespace pl = olib::openpluginlib;
-namespace olib { namespace openimagelib { namespace plugins { namespace TGA {
+namespace olib { namespace openimagelib { namespace il {
namespace
{
@@ -246,11 +245,47 @@
#undef TGA_TYPE_COLOR_RLE
#undef TGA_TYPE_GRAY_RLE
}
-
-il::image_type_ptr TGA_plugin::load( const fs::path& path )
-{ return load_tga( path ); }
-bool TGA_plugin::store( const fs::path& path, const il::image_type_ptr& )
-{ return false; }
+class tga_plugin : public il::openimagelib_plugin
+{
+public:
+ virtual il::image_type_ptr load( const fs::path& path )
+ { return load_tga( path ); }
+
+ virtual bool store( const fs::path&, const il::image_type_ptr& )
+ { return false; }
+};
-} } } }
+} } }
+
+extern "C"
+{
+ IL_DECLSPEC bool openplugin_init( void )
+ {
+ return true;
+ }
+
+ IL_DECLSPEC bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ IL_DECLSPEC bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new il::tga_plugin;
+ return true;
+ }
+
+ IL_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
+ { delete static_cast<il::tga_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.hpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.hpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -1,27 +0,0 @@
-
-// TGA - A TGA plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef TGA_PLUGIN_INC_
-#define TGA_PLUGIN_INC_
-
-#include <boost/filesystem/path.hpp>
-
-#include <openimagelib/plugins/tga/config.hpp>
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace olib { namespace openimagelib { namespace plugins { namespace TGA {
-
-class TGA_DECLSPEC TGA_plugin : public olib::openimagelib::il::openimagelib_plugin
-{
-public:
- virtual il::image_type_ptr load( const boost::filesystem::path& path );
- virtual bool store( const boost::filesystem::path& path, const il::image_type_ptr& image );
-};
-
-} } } }
-
-#endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TGA_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
BasicRuntimeChecks="3"
@@ -67,6 +67,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_tga-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -126,7 +127,7 @@
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TGA_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
@@ -151,6 +152,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_tga-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -196,10 +198,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\tga.cpp"
- >
- </File>
- <File
RelativePath=".\tga_plugin.cpp"
>
</File>
@@ -209,14 +207,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
- <File
- RelativePath=".\config.hpp"
- >
- </File>
- <File
- RelativePath=".\tga_plugin.hpp"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am 2007-05-23 19:36:34 UTC (rev 138)
@@ -10,9 +10,6 @@
lib_LTLIBRARIES = libopenimagelib_tiff.la
libopenimagelib_tiff_la_SOURCES = \
- config.hpp \
- tiff.cpp \
- tiff_plugin.hpp \
tiff_plugin.cpp
libopenimagelib_tiff_la_CXXFLAGS = \
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -1,25 +0,0 @@
-
-// TIFF - A TIFF plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef TIFF_CONFIG_INC_
-#define TIFF_CONFIG_INC_
-
-#ifdef WIN32
- #ifdef TIFF_EXPORTS
- #define TIFF_DECLSPEC __declspec( dllexport )
- #else
- #define TIFF_DECLSPEC __declspec( dllimport )
- #endif // TIFF_EXPORTS
-#else
- #ifdef TIFF_EXPORTS
- #define TIFF_DECLSPEC extern
- #else
- #define TIFF_DECLSPEC
- #endif // TIFF_EXPORTS
-#endif // WIN32
-
-#endif
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -1,33 +0,0 @@
-
-// TIFF - A TIFF plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/tiff/tiff_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace TIFF = olib::openimagelib::plugins::TIFF;
-
-extern "C"
-{
- TIFF_DECLSPEC bool openplugin_init( void )
- {
- return true;
- }
-
- TIFF_DECLSPEC bool openplugin_uninit( void )
- {
- return true;
- }
-
- TIFF_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
- {
- *plug = new TIFF::TIFF_plugin;
- return true;
- }
-
- TIFF_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
- { delete static_cast<TIFF::TIFF_plugin*>( plug ); }
-}
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -13,28 +13,22 @@
#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/path.hpp>
-#include <openimagelib/plugins/tiff/tiff_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
-namespace fs = boost::filesystem;
-namespace il = olib::openimagelib::il;
-namespace opl = olib::openpluginlib;
+namespace fs = boost::filesystem;
+namespace il = olib::openimagelib::il;
+namespace pl = olib::openpluginlib;
-namespace olib { namespace openimagelib { namespace plugins { namespace TIFF {
+namespace olib { namespace openimagelib { namespace il {
namespace
{
- void destroy( il::image_type* im )
- { delete im; }
-
il::image_type_ptr tiff_image_type_to_image_type( unsigned short components, int width, int height )
{
- typedef il::image<unsigned char, il::r8g8b8> r8g8b8_image_type;
- typedef il::image<unsigned char, il::r8g8b8a8> r8g8b8a8_image_type;
-
if( components == 4 )
- return il::image_type_ptr( new il::image_type( r8g8b8a8_image_type( width, height, 1 ) ), destroy );
+ return il::allocate( L"r8g8b8a8", width, height );
else if( components == 3 )
- return il::image_type_ptr( new il::image_type( r8g8b8_image_type( width, height, 1 ) ), destroy );
+ return il::allocate( L"r8g8b8", width, height );
return il::image_type_ptr( );
}
@@ -128,10 +122,46 @@
}
}
-il::image_type_ptr TIFF_plugin::load( const fs::path& path )
-{ return load_tiff( path ); }
+class tiff_plugin : public il::openimagelib_plugin
+{
+public:
+ virtual il::image_type_ptr load( const fs::path& path )
+ { return load_tiff( path ); }
+
+ virtual bool store( const fs::path&, const il::image_type_ptr& )
+ { return false; }
+};
-bool TIFF_plugin::store( const fs::path& path, const il::image_type_ptr& )
-{ return false; }
+} } }
-} } } }
+extern "C"
+{
+ IL_DECLSPEC bool openplugin_init( void )
+ {
+ return true;
+ }
+
+ IL_DECLSPEC bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ IL_DECLSPEC bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new il::tiff_plugin;
+ return true;
+ }
+
+ IL_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
+ { delete static_cast<il::tiff_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -1,27 +0,0 @@
-
-// TIFF - A TIFF plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef TIFF_PLUGIN_INC_
-#define TIFF_PLUGIN_INC_
-
-#include <boost/filesystem/path.hpp>
-
-#include <openimagelib/plugins/tiff/config.hpp>
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace olib { namespace openimagelib { namespace plugins { namespace TIFF {
-
-class TIFF_DECLSPEC TIFF_plugin : public olib::openimagelib::il::openimagelib_plugin
-{
-public:
- virtual il::image_type_ptr load( const boost::filesystem::path& path );
- virtual bool store( const boost::filesystem::path& path, const il::image_type_ptr& image );
-};
-
-} } } }
-
-#endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\libtiff\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIFF_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
BasicRuntimeChecks="3"
@@ -64,6 +64,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libtiff.lib"
OutputFile="$(OutDir)\openimagelib_tiff-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -124,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\libtiff\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIFF_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
@@ -147,6 +148,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libtiff.lib"
OutputFile="$(OutDir)\openimagelib_tiff-vc80-r-0_4_0.dll"
LinkIncremental="1"
@@ -193,10 +195,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\tiff.cpp"
- >
- </File>
- <File
RelativePath=".\tiff_plugin.cpp"
>
</File>
@@ -206,14 +204,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
- <File
- RelativePath=".\config.hpp"
- >
- </File>
- <File
- RelativePath=".\tiff_plugin.hpp"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
Modified: trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -64,6 +64,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
OutputFile="$(OutDir)\openimagelib.pyd"
LinkIncremental="2"
@@ -146,6 +147,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
OutputFile="$(OutDir)\openimagelib.pyd"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openmedialib_ml-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
@@ -148,6 +149,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openmedialib_ml-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openmedialib_gensys-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)""
@@ -148,6 +149,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openmedialib_gensys-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)""
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -65,6 +65,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openmedialib_ofx-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
@@ -146,6 +147,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openmedialib_ofx-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -67,6 +67,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openmedialib_oil-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
@@ -149,6 +150,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openmedialib_oil-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="CVClient.lib QTMLClient.lib"
OutputFile="$(OutDir)\openmedialib_quicktime-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -149,6 +150,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="CVClient.lib QTMLClient.lib"
OutputFile="$(OutDir)\openmedialib_quicktime-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
OutputFile="$(OutDir)\openmedialib.pyd"
LinkIncremental="2"
@@ -149,6 +150,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
OutputFile="$(OutDir)\openmedialib.pyd"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -71,6 +71,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)/openobjectlib_x3d-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
@@ -158,6 +159,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)/openobjectlib_x3d-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -68,6 +68,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)/openobjectlib_obj-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
@@ -153,6 +154,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)/openobjectlib_obj-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -72,6 +72,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="false"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="opengl32.lib glu32.lib glew32.lib cg.lib cgGL.lib"
OutputFile="$(OutDir)/openobjectlib_sg-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -160,6 +161,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="false"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="opengl32.lib glu32.lib glew32.lib cg.lib cgGL.lib"
OutputFile="$(OutDir)/openobjectlib_sg-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -67,6 +67,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="winmm.lib opengl32.lib glew32.lib cg.lib cgGL.lib"
OutputFile="$(OutDir)/openpluginlib_pl-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -153,6 +154,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="winmm.lib opengl32.lib glew32.lib cg.lib cgGL.lib"
OutputFile="$(OutDir)/openpluginlib_pl-vc80-r-0_4_0.dll"
LinkIncremental="1"
@@ -369,11 +371,11 @@
>
</File>
<File
- RelativePath=".\pcos\property.hpp"
+ RelativePath=".\property.hpp"
>
</File>
<File
- RelativePath=".\property.hpp"
+ RelativePath=".\pcos\property.hpp"
>
</File>
<File
Modified: trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -67,6 +67,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
OutputFile="$(OutDir)\openpluginlib.pyd"
LinkIncremental="2"
@@ -152,6 +153,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
OutputFile="$(OutDir)\openpluginlib.pyd"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -64,6 +64,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib"
GenerateDebugInformation="true"
@@ -144,6 +145,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -64,6 +64,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib"
GenerateDebugInformation="true"
@@ -142,6 +143,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib"
GenerateDebugInformation="true"
Modified: trunk/lib/o...
[truncated message content] |
