Changeset 926

Timestamp:

12/09/07 11:40:11 (1 year ago)

Author:

glslang

Message:

+ boostrap from ObjC on OS/X

Location:

trunk/jahtools/encoder

Files:

• bootstrap.py (modified) (2 diffs)
• encoder.xcodeproj (added)
• encoder.xcodeproj/goncalo.mode1 (added)
• encoder.xcodeproj/goncalo.pbxuser (added)
• encoder.xcodeproj/project.pbxproj (added)
• encoder_Prefix.pch (added)
• English.lproj (added)
• English.lproj/InfoPlist.strings (added)
• English.lproj/MainMenu.nib (added)
• English.lproj/MainMenu.nib/classes.nib (added)
• English.lproj/MainMenu.nib/info.nib (added)
• English.lproj/MainMenu.nib/keyedobjects.nib (added)
• Info.plist (added)
• main.m (added)

trunk/jahtools/encoder/bootstrap.py

@@ -7 +7 @@
 import os.path
 
-# This is required for the executable generated from py2exe
-# to use the preinstalled openlibraries python bindings
-if platform.system() == "Windows" or platform.system() == 'Microsoft':
-        #sys.path.append(os.path.join(os.getcwd(), "..", "openlibraries", "python"))
-        #sys.path.append(os.environ['PYTHONPATH'])
-        pass
-
 # Initialise the dynamic linking functionality - note that the ubuntu amd64
 # distro lacks the dl module, hence fallback to the non-symbolic values
-elif platform.system( ) == "Linux":
+if platform.system( ) == "Linux":
         try:
                 import dl
@@ -25 +18 @@
 # Initialise openpluginlib
 import openpluginlib
+import jahwidgets
 
-if platform.system() == "Darwin":
-        # Add search paths
-        import jahwidgets
-        olibs = jahwidgets.get_bundle_resources_directory_path()
-        olibs += os.path.join( "/../Frameworks" )
-
-        plugin_paths = [ olibs + "/openassetlib/plugins", 
-                                         olibs + "/openeffectslib/plugins",
-                                         olibs + "/openimagelib/plugins",
-                                         olibs + "/openmedialib/plugins",
-                                         olibs + "/openobjectlib/plugins" ]
-
-        openpluginlib.init( plugin_paths )
-elif platform.system() == "Windows" or platform.system() == 'Microsoft':
-        olibspath = os.path.join(os.getcwd(), "..", "openlibraries")
-        openpluginlib.init( os.path.join( olibspath, "plugins", "release" ),
-                                                os.path.join( olibspath, "kernels" ),
-                                                os.path.join( olibspath, "shaders" ))
-else:
-        openpluginlib.init()
+openpluginlib.init()