Changeset 394

Show
Ignore:
Timestamp:
11/09/09 05:31:22 (3 years ago)
Author:
doob
Message:

Missed a version statement for freebsd in loader. Removed the pragma link to libc

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/DerelictUtil/derelict/util/loader.d

    r393 r394  
    6767        version (freebsd) 
    6868        { 
    69             pragma(link, "c"); // the dl* functions are in libc on freebsd 
     69            // the dl* functions are in libc on freebsd which the compiler links automatically  
    7070        } 
    7171             
    …… 
    266266 
    267267struct GenericLoader { 
    268     void setup(char[] winLibs, char[] linLibs, char[] macLibs, void function(SharedLib) userLoad, char[] versionStr = "") { 
     268    void setup(char[] winLibs, char[] nixLibs, char[] macLibs, void function(SharedLib) userLoad, char[] versionStr = "") { 
    269269        assert (userLoad !is null); 
    270270        this.winLibs = winLibs; 
    271         this.linLibs = linLibs; 
     271        this.nixLibs = nixLibs; 
    272272        this.macLibs = macLibs; 
    273273        this.userLoad = userLoad; 
    …… 
    289289                libNameString = winLibs; 
    290290            } 
     291            else version (freebsd) { 
     292                libNameString = nixLibs; 
     293            } 
    291294            else version (linux) { 
    292                 libNameString = linLibs; 
     295                libNameString = nixLibs; 
    293296            } 
    294297            else version(darwin) { 
    …… 
    357360        SharedLib myLib; 
    358361        char[] winLibs; 
    359         char[] linLibs; 
     362        char[] nixLibs; 
    360363        char[] macLibs; 
    361364        char[] versionStr = "";