Merge branch '0.6'

mapeditor · Jul 20, 2011 · 8160eb2 · 8160eb2
2 parents 956395c + 3d3716f
commit 8160eb2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/dist/win/tiled.nsi b/dist/win/tiled.nsi
@@ -197,6 +197,9 @@ File ${QT_DIR}\plugins\imageformats\qgif4.dll
 File ${QT_DIR}\plugins\imageformats\qjpeg4.dll
 File ${QT_DIR}\plugins\imageformats\qtiff4.dll
 
+SetOutPath $INSTDIR\plugins\tiled
+File /r ${BUILD_DIR}\plugins\tiled\*.dll
+
 SetOutPath $INSTDIR\translations
 File  ${ROOT_DIR}\translations\*.qm
 ;File  ${QT_DIR}\translations\qt_cs.qm
@@ -259,6 +262,7 @@ Delete $INSTDIR\uninstall.exe
 
 RMDir /r $INSTDIR\plugins\codecs
 RMDir /r $INSTDIR\plugins\imageformats
+RMDir /r $INSTDIR\plugins\tiled
 RMDir    $INSTDIR\plugins
 RMDir /r $INSTDIR\translations
 RMDir /r $INSTDIR\examples