sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-22 00:06:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix windows build

Browse Source
This commit is contained in:
Juergen E. Fischer 2017-02-21 01:15:42 +01:00
parent baa5d90ddc
commit 4c92689d14
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/CMakeLists.txt
View File

@ -481,7 +481,6 @@ IF (WIN32)
SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} main.cpp ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS}) SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} main.cpp ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
SET (QGIS_APPMAIN_SRCS mainwin.cpp) SET (QGIS_APPMAIN_SRCS mainwin.cpp)
SET_SOURCE_FILES_PROPERTIES(mainwin.cpp PROPERTIES COMPILE_FLAGS -DMAINWIN_DLL=\\\"qgis_app.dll\\\")
IF (MSVC) IF (MSVC)
SET (QGIS_APPMAIN_SRCS ${QGIS_APPMAIN_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/qgis_win32.rc) SET (QGIS_APPMAIN_SRCS ${QGIS_APPMAIN_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/qgis_win32.rc)

5
src/app/mainwin.cpp
View File

@ -5,6 +5,7 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <list> #include <list>
#include <memory>
std::string moduleExeBaseName( void ) 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 ) 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; return EXIT_FAILURE;
} }