NSI fix

huggle · Dec 15, 2014 · df59935 · df59935
1 parent cfeaae3
commit df59935
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/huggle/CMakeLists.txt b/huggle/CMakeLists.txt
@@ -13,13 +13,17 @@ if (HUGGLE_EXT)
     add_subdirectory(extension_list/enwiki/)
     add_subdirectory(extension_list/mass-delivery/)
 endif()
-SET(CMAKE_CXX_FLAGS "-std=c++11")
 SET(QT_USE_QTNETWORK TRUE)
 SET(QT_USE_QTXML TRUE)
 SET(QT_USE_QTWEBKIT TRUE)
 SET(CMAKE_BUILD_TYPE Release)
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 SET(CMAKE_AUTOMOC ON)
+if(WIN32)
+	SET(CMAKE_CXX_FLAGS "-mwindows -std=c++11")
+else()
+	SET(CMAKE_CXX_FLAGS "-std=c++11")
+endif()
 #### Qt 4 and 5 ####
 if(QT5_BUILD)
     find_package(Qt5Core REQUIRED)

diff --git a/windows/Huggle.nsi b/windows/Huggle.nsi
@@ -125,8 +125,8 @@ File "release\platforms\qminimal.dll"
 File "release\platforms\qoffscreen.dll"
 File "release\platforms\qwindows.dll"
 SetOutPath "$INSTDIR\extensions"
-File "release\MassDelivery.dll"
-File "release\enwiki.dll"
+File "release\libhuggle_md.dll"
+File "release\liben.dll"
 SectionEnd
 
 ######################################################################
@@ -181,9 +181,9 @@ ${INSTALL_TYPE}
 Delete "$INSTDIR\${MAIN_APP_EXE}"
 Delete "$INSTDIR\icuin53.dll"
 Delete "$INSTDIR\libcore.dll.a"
-Delete "$INSTDIR\extensions\MassDelivery.dll"
+Delete "$INSTDIR\extensions\libhuggle_md.dll"
 Delete "$INSTDIR\libcore.dll"
-Delete "$INSTDIR\extensions\enwiki.dll"
+Delete "$INSTDIR\extensions\liben.dll"
 Delete "$INSTDIR\Qt5Core.dll"
 Delete "$INSTDIR\Qt5Multimedia.dll"
 Delete "$INSTDIR\icudt53.dll"