fix windows build

qgis · Feb 21, 2017 · 4c92689 · 4c92689
1 parent baa5d90
commit 4c92689
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -5,6 +5,7 @@
 #include <iostream>
 #include <fstream>
 #include <list>
+#include <memory>
 
 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;
   }