Commit 9df6a54f authored by jan.koester's avatar jan.koester
Browse files

libconf now static

parent 035904e9

src/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ set(confplussrc 
    exception.cpp

)



add_library(confplus SHARED ${confplussrc})

add_library(confplus STATIC ${confplussrc})



if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")

    target_link_libraries(confplus PUBLIC kernel32.lib)

src/conf.cpp

+3 −4
Original line number Diff line number Diff line
@@ -179,9 +179,6 @@ confplus::Config::Config(const char* path) { 


    int i = 0;



    std::string mpath = std::string(CONFIGPATH);

    mpath += "\\";



    while (path[i++] != ':') {

        if (i == strlen(path)) {

            ConfException err;
@@ -190,7 +187,9 @@ confplus::Config::Config(const char* path) { 
        }

    }



    std::copy(path +i , path + (i - 1), std::inserter<std::string>(mpath, mpath.end()));

    std::string mpath;



    std::copy(path +i , path + (i - 1), std::back_inserter(mpath));



    mpath += ".dll";