Changeset 526

Show
Ignore:
Timestamp:
04/05/11 09:21:34 (1 year ago)
Author:
aldacron
Message:

[Derelict2 - DerelictUtil?]
* in derelict.compat.findStr, cast the result of std.string.indexOf to an int when using D2.
[Derelict2 - DerelictSFML]
* added a missing function param to sfSoundRecorder_Create
* added additional library names to the loader on Linux
* added Framework names for the loader on Mac.

Closes #66 and closes #68

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Derelict2/DerelictSFML/derelict/sfml/afuncs.d

    r427 r526  
    130130 
    131131    // SoundRecorder.h 
    132     sfSoundRecorder* function(sfSoundRecorderStartCallback, sfSoundRecorderProcessCallback, sfSoundRecorderStopCallback) sfSoundRecorder_Create; 
     132    sfSoundRecorder* function(sfSoundRecorderStartCallback, sfSoundRecorderProcessCallback, sfSoundRecorderStopCallback, void*) sfSoundRecorder_Create; 
    133133    void function(sfSoundRecorder*) sfSoundRecorder_Destroy; 
    134134    void function(sfSoundRecorder*, uint) sfSoundRecorder_Start; 

  • branches/Derelict2/DerelictSFML/derelict/sfml/audio.d

    r404 r526  
    4646        super( 
    4747            "csfml-audio.dll", 
    48             "libcsfml-audio.so", 
    49             "" 
     48            "libcsfml-audio.so,libcsfml-audio.so.1.6", 
     49            "../Frameworks/csfml-audio.framework/csfml-audio, /Library/Frameworks/csfml-audio.framework/csfml-audio, /System/Library/Frameworks/csfml-audio.framework/csfml-audio" 
    5050        ); 
    5151    } 

  • branches/Derelict2/DerelictSFML/derelict/sfml/graphics.d

    r403 r526  
    4646        super( 
    4747            "csfml-graphics.dll", 
    48             "libcsfml-graphics.so", 
    49             "" 
     48            "libcsfml-graphics.so,libcsfml-graphics.so.1.6", 
     49            "../Frameworks/csfml-graphics.framework/csfml-graphics, /Library/Frameworks/csfml-graphics.framework/csfml-graphics, /System/Library/Frameworks/csfml-graphics.framework/csfml-graphics" 
    5050        ); 
    5151    } 

  • branches/Derelict2/DerelictSFML/derelict/sfml/network.d

    r406 r526  
    4646        super( 
    4747            "csfml-network.dll", 
    48             "libcsfml-network.so", 
    49             "" 
     48            "libcsfml-network.so,libcsfml-network.so.1.6", 
     49            "../Frameworks/csfml-network.framework/csfml-network, /Library/Frameworks/csfml-network.framework/csfml-network, /System/Library/Frameworks/csfml-network.framework/csfml-network" 
    5050        ); 
    5151    } 

  • branches/Derelict2/DerelictSFML/derelict/sfml/system.d

    r397 r526  
    4646        super( 
    4747            "csfml-system.dll", 
    48             "libcsfml-system.so", 
    49             "" 
     48            "libcsfml-system.so,libcsfml-system.so.1.6", 
     49            "../Frameworks/csfml-system.framework/csfml-system, /Library/Frameworks/csfml-system.framework/csfml-system, /System/Library/Frameworks/csfml-system.framework/csfml-system" 
    5050        ); 
    5151    } 

  • branches/Derelict2/DerelictSFML/derelict/sfml/window.d

    r396 r526  
    4646        super( 
    4747            "csfml-window.dll", 
    48             "libcsfml-window.so", 
    49             "" 
     48            "libcsfml-window.so,libcsfml-window.so.1.6", 
     49            "../Frameworks/csfml-window.framework/csfml-window, /Library/Frameworks/csfml-window.framework/csfml-window, /System/Library/Frameworks/csfml-window.framework/csfml-window" 
    5050        ); 
    5151    } 

  • branches/Derelict2/DerelictUtil/derelict/util/compat.d

    r506 r526  
    123123        version(D_Version2) 
    124124        { 
    125             mixin("return indexOf(str, match);"); 
     125            mixin("return cast(int)indexOf(str, match);"); 
    126126        } 
    127127        else