Commit b46671f7 authored by jan.koester's avatar jan.koester
Browse files

test

parent 1fe71cba

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ else() 
    )

endif()



add_definitions(-D${CMAKE_SYSTEM_NAME} -D${CMAKE_CXX_COMPILER_ID})

add_definitions(-D${CMAKE_CXX_COMPILER_ID})



configure_file(config.h.in ${CMAKE_BINARY_DIR}/config.h)

config.h.in

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

#ifdef _WIN32

#define CONFIGPATH ""

#else

#define CONFIGPATH "${CMAKE_INSTALL_FULL_LIBDIR}/confplus/backend/"

src/backend.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


#pragma once



#ifdef Windows

#ifdef _WIN32

#define EXPORT extern "C" __declspec(dllexport)

#else

#define EXPORT extern "C"

src/conf.cpp

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ size_t confplus::Config::ConfigData::getElements() const{ 
    return Elements;

}



#ifdef Windows

#ifdef _WIN32

confplus::Config::Config(const std::string &path) {

    std::string mpath = CONFIGPATH;

src/conf.h

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


#include "backend.h"



#ifdef Windows

#ifdef _WIN32

#define WIN32_LEAN_AND_MEAN

#include <windows.h> 

#else
@@ -105,11 +105,11 @@ namespace confplus { 
        void saveConfig(const char *path);

    private:

        BackendApi *_currApi;

#ifdef Windows

#ifdef _WIN32

        HMODULE _BackendData;

#else

        void* _BackendData;

#endif // Windows

#endif // _WIN32



        

    };