[miniaudicle] r18 committed - - support for DL paths
minia...@googlecode.com
Author: spencer.salazar
Date: Thu Apr 14 10:53:47 2011
Log: - support for DL paths
http://code.google.com/p/miniaudicle/source/detail?r=18
Modified:
/trunk/src/macosx/miniAudiclePreferencesController.h
/trunk/src/macosx/miniAudiclePreferencesController.mm
/trunk/src/miniAudicle.cpp
/trunk/src/miniAudicle.h
/trunk/src/miniAudicle.xcodeproj/project.pbxproj
=======================================
--- /trunk/src/macosx/miniAudiclePreferencesController.h Sat Oct 3
21:54:08 2009
+++ /trunk/src/macosx/miniAudiclePreferencesController.h Thu Apr 14
10:53:47 2011
@@ -66,6 +66,8 @@
extern NSString * mAPreferencesSoundfilesDirectory;
extern NSString * mAPreferencesBackupSuffix;
+extern NSString * mAPreferencesLibraryPath;
+
extern NSString * mASyntaxColoringChangedNotification;
extern NSString * mAPreferencesChangedNotification;
=======================================
--- /trunk/src/macosx/miniAudiclePreferencesController.mm Sat Oct 3
21:54:08 2009
+++ /trunk/src/macosx/miniAudiclePreferencesController.mm Thu Apr 14
10:53:47 2011
@@ -79,6 +79,8 @@
NSString * mAPreferencesSoundfilesDirectory = @"SoundfilesDirectory";
NSString * mAPreferencesBackupSuffix = @"BackupSuffix";
+NSString * mAPreferencesLibraryPath = @"LibraryPath";
+
NSString * mASyntaxColoringChangedNotification =
@"mASyntaxColoringChanged";
NSString * mAPreferencesChangedNotification = @"mAPreferencesChanged";
@@ -389,6 +391,8 @@
[defaults setObject:[NSNumber numberWithBool:YES]
forKey:mAPreferencesShowStatusBar];
[defaults setObject:[NSNumber numberWithBool:NO]
forKey:mAPreferencesEnableOTFVisuals];
+ [defaults setObject:[NSArray arrayWithObjects:@"/usr/lib/chuck",
nil] forKey:mAPreferencesLibraryPath];
+
[[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
// TODO: apparently this needs to happen before awakeFromNib
@@ -584,6 +588,15 @@
[[NSNotificationCenter defaultCenter]
postNotificationName:mAPreferencesChangedNotification
object:self];
//*/
+
+ vector< string > library_paths;
+ NSArray * obj_library_paths = [[NSUserDefaults standardUserDefaults]
objectForKey:mAPreferencesLibraryPath];
+ for(int i = 0; i < [obj_library_paths count]; i++)
+ {
+ NSString * path = [obj_library_paths objectAtIndex:i];
+ library_paths.push_back([path UTF8String]);
+ }
+ [mac miniAudicle]->set_library_paths(library_paths);
}
- (void)awakeFromNib
@@ -641,6 +654,15 @@
ma->set_enable_network_thread( [[[NSUserDefaults standardUserDefaults]
objectForKey:mAPreferencesAcceptsNetworkCommands] intValue] == NSOnState );
chdir( [[[NSUserDefaults standardUserDefaults]
objectForKey:mAPreferencesSoundfilesDirectory] cString] );
+ vector< string > library_paths;
+ NSArray * obj_library_paths = [[NSUserDefaults standardUserDefaults]
objectForKey:mAPreferencesLibraryPath];
+ for(int i = 0; i < [obj_library_paths count]; i++)
+ {
+ NSString * path = [obj_library_paths objectAtIndex:i];
+ library_paths.push_back([path UTF8String]);
+ }
+ ma->set_library_paths(library_paths);
+
// [self loadGUIFromDefaults];
// [self loadMiniAudicleFromGUI];
=======================================
--- /trunk/src/miniAudicle.cpp Sat Oct 3 21:54:08 2009
+++ /trunk/src/miniAudicle.cpp Thu Apr 14 10:53:47 2011
@@ -826,8 +826,19 @@
// allocate the compiler
g_compiler = compiler = new Chuck_Compiler;
+
// initialize the compiler
- compiler->initialize( vm );
+ string lib_search_path = "";
+ for(vector<string>::iterator i = vm_options.library_paths.begin();
+ i != vm_options.library_paths.end(); i++)
+ {
+ if(i != vm_options.library_paths.begin())
+ lib_search_path += ":";
+ lib_search_path += (*i);
+ }
+
+ list<string> named_dls;
+ compiler->initialize( vm, lib_search_path, named_dls );
// enable dump
compiler->emitter->dump = FALSE;
// set auto depend
@@ -1368,6 +1379,18 @@
{
return g_enable_system_cmd;
}
+
+t_CKBOOL miniAudicle::set_library_paths( vector< string > & paths )
+{
+ vm_options.library_paths = paths;
+ return TRUE;
+}
+
+t_CKBOOL miniAudicle::get_library_paths( vector< string > & paths )
+{
+ paths = vm_options.library_paths;
+ return TRUE;
+}
//-----------------------------------------------------------------------------
// name: get_new_class_names()
=======================================
--- /trunk/src/miniAudicle.h Sat Oct 3 21:54:08 2009
+++ /trunk/src/miniAudicle.h Thu Apr 14 10:53:47 2011
@@ -140,6 +140,8 @@
t_CKBOOL get_blocking();
t_CKBOOL set_enable_std_system( t_CKBOOL enable );
t_CKBOOL get_enable_std_system();
+ t_CKBOOL set_library_paths( vector< string > & paths );
+ t_CKBOOL get_library_paths( vector< string > & paths );
protected:
map< t_CKUINT, vector< t_CKUINT > * > documents; // maps documents to
shreds
@@ -190,6 +192,7 @@
t_CKBOOL enable_audio;
t_CKBOOL enable_network;
t_CKBOOL enable_block;
+ vector< string > library_paths;
} vm_options;
};
=======================================
--- /trunk/src/miniAudicle.xcodeproj/project.pbxproj Thu Jan 6 18:12:08
2011
+++ /trunk/src/miniAudicle.xcodeproj/project.pbxproj Thu Apr 14 10:53:47
2011
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 45;
objects = {
/* Begin PBXBuildFile section */
@@ -13,6 +13,7 @@
090B4B1D0C4F038E00DF5577 /* uana_xform.cpp in Sources */ = {isa =
PBXBuildFile; fileRef = 090B4B1A0C4F038E00DF5577 /* uana_xform.cpp */; };
090B4B1E0C4F038E00DF5577 /* uana_xform.cpp in Sources */ = {isa =
PBXBuildFile; fileRef = 090B4B1A0C4F038E00DF5577 /* uana_xform.cpp */; };
0910DF7A0B1D0D0800BBC2B8 /* mAParentFrame.cpp in Sources */ = {isa =
PBXBuildFile; fileRef = 0910DF790B1D0D0800BBC2B8 /* mAParentFrame.cpp */;
settings = {COMPILER_FLAGS = "-D__MACOSX_CORE__ -D__LINUX__
-DwxUSE_UNICODE=1 -D__MA_WXWIDGETS__
-I/sw/lib/wx/include/gtk2-unicode-debug-2.8 -I/sw/include/wx-2.8
-D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
-D__WXDEBUG__"; }; };
+ 09216C0A134ED4A900145064 /* MultitouchSupport.framework in Frameworks */
= {isa = PBXBuildFile; fileRef = 09216C09134ED4A900145064 /*
MultitouchSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
09297A160B4DED60005C3B7A /* IOBluetooth.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 092979FB0B4DED60005C3B7A /*
IOBluetooth.framework */; };
09297A170B4DED60005C3B7A /* IOBluetooth.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 092979FB0B4DED60005C3B7A /*
IOBluetooth.framework */; };
09297A180B4DED60005C3B7A /* IOBluetooth.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 092979FB0B4DED60005C3B7A /*
IOBluetooth.framework */; };
@@ -523,6 +524,7 @@
090B4B1A0C4F038E00DF5577 /* uana_xform.cpp */ = {isa = PBXFileReference;
fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path =
uana_xform.cpp; sourceTree = "<group>"; };
090B4B1B0C4F038E00DF5577 /* uana_xform.h */ = {isa = PBXFileReference;
fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = uana_xform.h;
sourceTree = "<group>"; };
0910DF790B1D0D0800BBC2B8 /* mAParentFrame.cpp */ = {isa =
PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType =
sourcecode.cpp.cpp; lineEnding = 0; name = mAParentFrame.cpp; path =
wxw/mAParentFrame.cpp; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs =
0; };
+ 09216C09134ED4A900145064 /* MultitouchSupport.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
MultitouchSupport.framework; path =
System/Library/PrivateFrameworks/MultitouchSupport.framework; sourceTree =
SDKROOT; };
092979FB0B4DED60005C3B7A /* IOBluetooth.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
IOBluetooth.framework; path =
/System/Library/Frameworks/IOBluetooth.framework; sourceTree
= "<absolute>"; };
093D84DD0B7A99F200E55E71 /* RBSplitSubview.h */ = {isa =
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h;
name = RBSplitSubview.h; path = macosx/RBSplitSubview.h; sourceTree =
SOURCE_ROOT; };
093D84DE0B7A99F200E55E71 /* RBSplitSubview.m */ = {isa =
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc;
name = RBSplitSubview.m; path = macosx/RBSplitSubview.m; sourceTree =
SOURCE_ROOT; };
@@ -1049,6 +1051,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 09216C0A134ED4A900145064 /* MultitouchSupport.framework in Frameworks
*/,
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
09A40BD80A9A57C6007604EA /* Carbon.framework in Frameworks */,
09A40BD90A9A57C6007604EA /* CoreAudio.framework in Frameworks */,
@@ -1921,6 +1924,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 09216C09134ED4A900145064 /* MultitouchSupport.framework */,
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
);
@@ -1989,7 +1993,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
buildConfigurationList = C01FCF4E08A954540054247B /* Build
configuration list for PBXProject "miniAudicle" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -2615,7 +2619,6 @@
);
PREBINDING = NO;
PRODUCT_NAME = miniAudicle;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
ZERO_LINK = NO;
};
name = Debug;
@@ -2642,6 +2645,7 @@
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
+ "\"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_1
= "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../dep\"";
@@ -2657,7 +2661,7 @@
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = macosx/Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
- MACOSX_DEPLOYMENT_TARGET = 10.3;
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_LDFLAGS = (
"-lm",
"-lstdc++",
@@ -2679,6 +2683,7 @@
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
+ "\"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_1
= "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../dep\"";
@@ -2692,7 +2697,7 @@
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = macosx/Info.plist;
INSTALL_PATH = /Applications;
- MACOSX_DEPLOYMENT_TARGET = 10.3;
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_LDFLAGS = (
"-lm",
"-lstdc++",
@@ -2716,7 +2721,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.3;
PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT = macosx10.6;
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
};
@@ -2736,7 +2741,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT = macosx10.6;
YACC_GENERATED_FILE_STEM = InputFileStem;
};
name = Release;