[cadcdev-svn-commits] SF.net SVN: cadcdev: [471] tiki/osx

[<at...@us...>]

Revision: 471
          http://cadcdev.svn.sourceforge.net/cadcdev/?rev=471&view=rev
Author:   atani
Date:     2007-08-16 11:46:17 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
use "svn export" instead of cp for copying to Tiki.framework/PrivateHeaders
check ALC_[MAJOR,MINOR]_VERSION fields before casting getenv return value, CoreAudioSDK 1.4.3 requires the cast

Modified Paths:
--------------
    tiki/osx/Tiki.xcodeproj/project.pbxproj
    tiki/osx/src/init_shutdown.cpp

Modified: tiki/osx/Tiki.xcodeproj/project.pbxproj
===================================================================
--- tiki/osx/Tiki.xcodeproj/project.pbxproj	2007-08-16 17:22:51 UTC (rev 470)
+++ tiki/osx/Tiki.xcodeproj/project.pbxproj	2007-08-16 18:46:17 UTC (rev 471)
@@ -1045,7 +1045,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "HDRS=${BUILT_PRODUCTS_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\n\nif ! [ -e \"$HDRS\" ]; then mkdir \"$HDRS\"; fi\n\n#if [ -L \"$HDRS\"/boost ]; then rm -f \"$HDRS\"/boost; fi\n#ln -s ../../../../../../3rdparty/boost \"$HDRS\"\n\ncp -fpvR ../include/Tiki/* \"$HDRS\"\ncp -fpvR include/Tiki/* \"$HDRS\"\n";
+			shellScript = "HDRS=${BUILT_PRODUCTS_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\n\nif ! [ -e \"$HDRS\" ]; then mkdir \"$HDRS\"; fi\n\nsvn export --force --non-interactive ../include/Tiki \"$HDRS\"\nsvn export --force --non-interactive include/Tiki \"$HDRS\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

Modified: tiki/osx/src/init_shutdown.cpp
===================================================================
--- tiki/osx/src/init_shutdown.cpp	2007-08-16 17:22:51 UTC (rev 470)
+++ tiki/osx/src/init_shutdown.cpp	2007-08-16 18:46:17 UTC (rev 471)
@@ -31,8 +31,12 @@
 bool init( int argc, char **argv ) {
 	ALCdevice * dev = NULL;
 	ALCcontext *ctx = NULL;
+#if ALC_MAJOR_VERSION == 0x1000 && ALC_MINOR_VERSION == 0x1001
+	dev = alcOpenDevice( (ALCubyte *)( getenv( "OPENAL_DEVICE" ) ) );  // getenv()==NULL is okay.
+#else
+	dev = alcOpenDevice( getenv( "OPENAL_DEVICE" ) );  // getenv()==NULL is okay.
+#endif
 
-	dev = alcOpenDevice( (ALCubyte *)( getenv( "OPENAL_DEVICE" ) ) );  // getenv()==NULL is okay.
 	if ( dev != NULL ) {
 		ctx = alcCreateContext( dev, 0 );
 		if ( ctx != NULL ) {


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