Commit 1eebb92a authored by jan.koester's avatar jan.koester
Browse files

now windows supported

parent 9df6a54f

CMakeSettings.json

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
                },

                {

                    "name": "YAML_LIBRARIES",

                    "value": "C:/Users/jan.koester/source/repos/libyaml/out/install/x64-Debug/lib/yaml.lib",

                    "value": "C:/Users/jan.koester/source/repos/libyaml/out/install/x64-Debug/lib/libyaml.lib",

                    "type": "FILEPATH"

                }

            ]

backends/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ if(${YAML_FOUND}) 
    target_include_directories(yamlconf PRIVATE ${YAML_INCLUDE_DIR})



if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")

    target_compile_definitions(yamlconf PRIVATE YAML_DECLARE_STATIC )

    target_link_libraries(yamlconf PUBLIC confplus PRIVATE ${YAML_LIBRARIES} kernel32.lib )

    install(FILES ${YAML_LIBRARIES} DESTINATION lib)

else()

    target_link_libraries(yamlconf PUBLIC confplus PRIVATE ${YAML_LIBRARIES} dl)

endif()

backends/ini/ini.h

+2 −2
Original line number Diff line number Diff line
@@ -44,11 +44,11 @@ namespace confplus { 
    };

};



extern "C" confplus::BackendApi* create() {

EXPORT confplus::BackendApi* create() {

    return new confplus::Ini();

}



extern "C" void destroy(confplus::BackendApi* p) {

EXPORT void destroy(confplus::BackendApi* p) {

    delete p;

}

backends/yaml/yamlconf.h

+2 −2
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ namespace confplus { 
    };

};



extern "C" confplus::BackendApi* create() {

EXPORT confplus::BackendApi* create() {

    return new confplus::Yaml();

}



extern "C" void destroy(confplus::BackendApi* p) {

EXPORT void destroy(confplus::BackendApi* p) {

    delete p;

}

config.h.in

+2 −2
Original line number Diff line number Diff line 
#ifdef Windows

#define CONFIGPATH ".\lib\\confplus\\backend"

#define CONFIGPATH "${CMAKE_INSTALL_PREFIX}/lib/confplus/backend/"

#else

#define CONFIGPATH "${CMAKE_INSTALL_PREFIX}/lib/confplus/backend"

#define CONFIGPATH "${CMAKE_INSTALL_PREFIX}/lib/confplus/backend/"

#endif
 
 No newline at end of file