Changeset 359

Show
Ignore:
Timestamp:
04/07/07 17:27:38 (2 years ago)
Author:
hagedorn
Message:

set LL2.0 project to use shared dylibs directory, upgraded driver to b4

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/LaserLine_2.0/LaserLine_2.0.xcodeproj/project.pbxproj

    r346 r359  
    4040                D2F8CE020BA18F7D00C463D4 /* LaserTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2F8CDAF0BA18F6F00C463D4 /* LaserTools.framework */; }; 
    4141                D2F8CE030BA18F7D00C463D4 /* Timeline.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2F8CDB00BA18F6F00C463D4 /* Timeline.framework */; }; 
    42                 D2F8CE220BA190CB00C463D4 /* libEasyLase.1.0b1.dylib in Resources */ = {isa = PBXBuildFile; fileRef = D2F8CE210BA190CB00C463D4 /* libEasyLase.1.0b1.dylib */; }; 
    43                 D2F8CE340BA1911900C463D4 /* libEasyLase.1.0b1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D2F8CE210BA190CB00C463D4 /* libEasyLase.1.0b1.dylib */; }; 
    4442                D2F8CE6C0BA1936500C463D4 /* Build.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = D2F8CE6B0BA1936500C463D4 /* Build.xcconfig */; }; 
    4543                D42887110BAE259300F4F72D /* LZ3DTorus.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = D428870F0BAE259300F4F72D /* LZ3DTorus.h */; }; 
     
    4846                D461AECA0BB4C74900EEF5FB /* LZBeamEffect.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = D461AEC80BB4C74900EEF5FB /* LZBeamEffect.h */; }; 
    4947                D461AECB0BB4C74900EEF5FB /* LZBeamEffect.m in Sources */ = {isa = PBXBuildFile; fileRef = D461AEC90BB4C74900EEF5FB /* LZBeamEffect.m */; }; 
     48                D4957DFB0BC8501A00E3105D /* libEasyLase.1.0b4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D4957DFA0BC8501A00E3105D /* libEasyLase.1.0b4.dylib */; }; 
     49                D4957DFD0BC8501F00E3105D /* libftd2xx.0.1.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D4957DFC0BC8501F00E3105D /* libftd2xx.0.1.3.dylib */; }; 
     50                D4957E020BC8504C00E3105D /* libEasyLase.1.0b4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = D4957DFA0BC8501A00E3105D /* libEasyLase.1.0b4.dylib */; }; 
     51                D4957E070BC8505300E3105D /* libftd2xx.0.1.3.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = D4957DFC0BC8501F00E3105D /* libftd2xx.0.1.3.dylib */; }; 
    5052                D4C76FBF0BA12EBB00418A28 /* LZAnticlock.m in Sources */ = {isa = PBXBuildFile; fileRef = D4C76FBD0BA12EBB00418A28 /* LZAnticlock.m */; }; 
    5153                D4D748AD0B9A91C0008E17D1 /* FlashImport.m in Sources */ = {isa = PBXBuildFile; fileRef = D4D748AB0B9A91C0008E17D1 /* FlashImport.m */; }; 
     
    7779                F8A6D5830B78592500652C81 /* ILDAtypes.c in Sources */ = {isa = PBXBuildFile; fileRef = F8A6D5800B78592500652C81 /* ILDAtypes.c */; }; 
    7880                F8BCE3870BA175A10027E9F6 /* LZRenderedFrameView.m in Sources */ = {isa = PBXBuildFile; fileRef = F8BCE3850BA175A10027E9F6 /* LZRenderedFrameView.m */; }; 
    79                 F8ED93770B913ACA00FB453A /* libftd2xx.0.1.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F8ED93750B913ACA00FB453A /* libftd2xx.0.1.3.dylib */; }; 
    80                 F8ED93790B913AE800FB453A /* libftd2xx.0.1.3.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = F8ED93750B913ACA00FB453A /* libftd2xx.0.1.3.dylib */; }; 
    8181/* End PBXBuildFile section */ 
    8282 
     
    159159                        dstSubfolderSpec = 7; 
    160160                        files = ( 
    161                                 F8ED93790B913AE800FB453A /* libftd2xx.0.1.3.dylib in CopyFiles */, 
     161                                D4957E020BC8504C00E3105D /* libEasyLase.1.0b4.dylib in CopyFiles */, 
     162                                D4957E070BC8505300E3105D /* libftd2xx.0.1.3.dylib in CopyFiles */, 
    162163                                A8F7F9100BA3AA8D00674CC4 /* LZOutputDevice.h in CopyFiles */, 
    163164                                A80467100BA3B12100CADE97 /* LZAudioOutputDevice.h in CopyFiles */, 
     
    213214                D2F8CDAF0BA18F6F00C463D4 /* LaserTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LaserTools.framework; path = ../Build/Debug/LaserTools.framework; sourceTree = SOURCE_ROOT; }; 
    214215                D2F8CDB00BA18F6F00C463D4 /* Timeline.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Timeline.framework; path = ../Build/Debug/Timeline.framework; sourceTree = SOURCE_ROOT; }; 
    215                 D2F8CE210BA190CB00C463D4 /* libEasyLase.1.0b1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libEasyLase.1.0b1.dylib; path = ../ILDAInspector/dylibs/libEasyLase.1.0b1.dylib; sourceTree = SOURCE_ROOT; }; 
    216216                D2F8CE6B0BA1936500C463D4 /* Build.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = Build.xcconfig; sourceTree = "<group>"; }; 
    217217                D428870F0BAE259300F4F72D /* LZ3DTorus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LZ3DTorus.h; sourceTree = "<group>"; }; 
     
    220220                D461AEC80BB4C74900EEF5FB /* LZBeamEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LZBeamEffect.h; sourceTree = "<group>"; }; 
    221221                D461AEC90BB4C74900EEF5FB /* LZBeamEffect.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LZBeamEffect.m; sourceTree = "<group>"; }; 
     222                D4957DFA0BC8501A00E3105D /* libEasyLase.1.0b4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libEasyLase.1.0b4.dylib; path = ../dylibs/libEasyLase.1.0b4.dylib; sourceTree = SOURCE_ROOT; }; 
     223                D4957DFC0BC8501F00E3105D /* libftd2xx.0.1.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libftd2xx.0.1.3.dylib; path = ../dylibs/libftd2xx.0.1.3.dylib; sourceTree = SOURCE_ROOT; }; 
    222224                D4C76FBC0BA12EBB00418A28 /* LZAnticlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LZAnticlock.h; sourceTree = "<group>"; }; 
    223225                D4C76FBD0BA12EBB00418A28 /* LZAnticlock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LZAnticlock.m; sourceTree = "<group>"; }; 
     
    280282                F8BCE3850BA175A10027E9F6 /* LZRenderedFrameView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = LZRenderedFrameView.m; path = Src/Interface/LZRenderedFrameView.m; sourceTree = SOURCE_ROOT; }; 
    281283                F8ED936B0B913A6D00FB453A /* easylase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = easylase.h; path = ../ILDAInspector/easylase.h; sourceTree = SOURCE_ROOT; }; 
    282                 F8ED93750B913ACA00FB453A /* libftd2xx.0.1.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libftd2xx.0.1.3.dylib; path = ../ILDAInspector/dylibs/libftd2xx.0.1.3.dylib; sourceTree = SOURCE_ROOT; }; 
    283284/* End PBXFileReference section */ 
    284285 
     
    292293                                D2F8CE030BA18F7D00C463D4 /* Timeline.framework in Frameworks */, 
    293294                                8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, 
    294                                 F8ED93770B913ACA00FB453A /* libftd2xx.0.1.3.dylib in Frameworks */, 
    295                                 D2F8CE340BA1911900C463D4 /* libEasyLase.1.0b1.dylib in Frameworks */, 
    296295                                D45F3CB80BAA71F80076788A /* QTKit.framework in Frameworks */, 
     296                                D4957DFB0BC8501A00E3105D /* libEasyLase.1.0b4.dylib in Frameworks */, 
     297                                D4957DFD0BC8501F00E3105D /* libftd2xx.0.1.3.dylib in Frameworks */, 
    297298                        ); 
    298299                        runOnlyForDeploymentPostprocessing = 0; 
     
    392393                        isa = PBXGroup; 
    393394                        children = ( 
     395                                D4957DFA0BC8501A00E3105D /* libEasyLase.1.0b4.dylib */, 
     396                                D4957DFC0BC8501F00E3105D /* libftd2xx.0.1.3.dylib */, 
    394397                                D45F3CB70BAA71F80076788A /* QTKit.framework */, 
    395                                 D2F8CE210BA190CB00C463D4 /* libEasyLase.1.0b1.dylib */, 
    396                                 F8ED93750B913ACA00FB453A /* libftd2xx.0.1.3.dylib */, 
    397398                                1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */, 
    398399                                1058C7A2FEA54F0111CA2CBB /* Other Frameworks */, 
     
    664665                                C4C0194F0BA1371200B17D07 /* stopbutton-H.tiff in Resources */, 
    665666                                C4C019500BA1371200B17D07 /* stopbutton-N.tiff in Resources */, 
    666                                 D2F8CE220BA190CB00C463D4 /* libEasyLase.1.0b1.dylib in Resources */, 
    667667                                D2F8CE6C0BA1936500C463D4 /* Build.xcconfig in Resources */, 
    668668                        ); 
     
    683683                        runOnlyForDeploymentPostprocessing = 0; 
    684684                        shellPath = /bin/sh; 
    685                         shellScript = "install_name_tool -change /usr/local/lib/libEasyLase.1.0b1.dylib @executable_path/../Resources/libEasyLase.1.0b1.dylib \"$TARGET_BUILD_DIR/LaserLine.app/Contents/MacOS/LaserLine\"\ninstall_name_tool -change /usr/local/lib/libftd2xx.0.1.3.dylib @executable_path/../Resources/libftd2xx.0.1.3.dylib \"$TARGET_BUILD_DIR/LaserLine.app/Contents/MacOS/LaserLine\"\ninstall_name_tool -change /usr/local/lib/libftd2xx.0.1.3.dylib @executable_path/../Resources/libftd2xx.0.1.3.dylib  \"$TARGET_BUILD_DIR/LaserLine.app/Contents/Resources/libEasyLase.1.0b1.dylib\"\n"; 
     685                        shellScript = "install_name_tool -change /usr/local/lib/libEasyLase.1.0b4.dylib @executable_path/../Resources/libEasyLase.1.0b4.dylib \"$TARGET_BUILD_DIR/LaserLine.app/Contents/MacOS/LaserLine\"\ninstall_name_tool -change /usr/local/lib/libftd2xx.0.1.3.dylib @executable_path/../Resources/libftd2xx.0.1.3.dylib \"$TARGET_BUILD_DIR/LaserLine.app/Contents/MacOS/LaserLine\"\ninstall_name_tool -change /usr/local/lib/libftd2xx.0.1.3.dylib @executable_path/../Resources/libftd2xx.0.1.3.dylib  \"$TARGET_BUILD_DIR/LaserLine.app/Contents/Resources/libEasyLase.1.0b4.dylib\"\n"; 
    686686                }; 
    687687/* End PBXShellScriptBuildPhase section */ 
     
    788788                                        "$(SRCROOT)/../ILDAInspector/dylibs/libEasyLase.1.0b1.dylib", 
    789789                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", 
     790                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", 
    790791                                ); 
    791792                                LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../ILDAInspector/dylibs\""; 
     793                                LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../dylibs\""; 
    792794                                PRODUCT_NAME = LaserLine; 
    793795                                WRAPPER_EXTENSION = app; 
     
    811813                                        "$(SRCROOT)/../ILDAInspector/dylibs/libEasyLase.1.0b1.dylib", 
    812814                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", 
     815                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", 
    813816                                ); 
    814817                                LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../ILDAInspector/dylibs\""; 
     818                                LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../dylibs\""; 
    815819                                PRODUCT_NAME = LaserLine; 
    816820                                WRAPPER_EXTENSION = app;