diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 7a5306e790a..40f078f6d41 100755 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -481,7 +481,6 @@ IF (WIN32) SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} main.cpp ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS}) SET (QGIS_APPMAIN_SRCS mainwin.cpp) - SET_SOURCE_FILES_PROPERTIES(mainwin.cpp PROPERTIES COMPILE_FLAGS -DMAINWIN_DLL=\\\"qgis_app.dll\\\") IF (MSVC) SET (QGIS_APPMAIN_SRCS ${QGIS_APPMAIN_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/qgis_win32.rc) diff --git a/src/app/mainwin.cpp b/src/app/mainwin.cpp index 75e88233707..39bc074e159 100644 --- a/src/app/mainwin.cpp +++ b/src/app/mainwin.cpp @@ -5,6 +5,7 @@ #include #include #include +#include std::string moduleExeBaseName( void ) { @@ -104,10 +105,10 @@ int CALLBACK WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL } } - HINSTANCE hGetProcIDDLL = LoadLibrary( MAINWIN_DLL ); + HINSTANCE hGetProcIDDLL = LoadLibrary( "qgis_app.dll" ); if ( !hGetProcIDDLL ) { - std::cerr << "Could not load the " MAINWIN_DLL << std::endl; + std::cerr << "Could not load the qgis_app.dll" << std::endl; return EXIT_FAILURE; }