[mxe] update to new libs, incomplete

mean00 · May 1, 2017 · da288fd · da288fd
1 parent f106086
commit da288fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/avidemux/winInstaller/avidemux_cross64Qt5.nsi b/avidemux/winInstaller/avidemux_cross64Qt5.nsi
@@ -18,10 +18,10 @@ Section "Avidemux Core" SecCore
     ${File} ${ROOT_FOLDER}/libglib-2.0-0.dll
     ${File} ${ROOT_FOLDER}/libgobject-2.0-0.dll
     ${File} ${ROOT_FOLDER}/libharfbuzz-0.dll
-    ${File} ${ROOT_FOLDER}/libiconv.dll
+    ${File} ${ROOT_FOLDER}/libiconv-2.dll
     ${File} ${ROOT_FOLDER}/libpcre16-0.dll
-    ${File} ${ROOT_FOLDER}/libpng14-14.dll
-    ${File} ${ROOT_FOLDER}/libsqlite3.dll
+    ${File} ${ROOT_FOLDER}/libpng16-16.dll
+    ${File} ${ROOT_FOLDER}/libsqlite3-0.dll
     ${File} ${ROOT_FOLDER}/libstdc++-6.dll
     ${File} ${ROOT_FOLDER}/libwinpthread-1.dll
     ${File} ${ROOT_FOLDER}/libz-1.dll
@@ -37,13 +37,13 @@ Section "Avidemux Core" SecCore
     ${File} ${ROOT_FOLDER}/Qt5Widgets.dll
     ${File} ${ROOT_FOLDER}/Qt5Network.dll
     ${File} ${ROOT_FOLDER}/Qt5WinExtras.dll
-    ${File} ${ROOT_FOLDER}/libicudt51.dll 
-    ${File} ${ROOT_FOLDER}/libicuin51.dll  
-    ${File} ${ROOT_FOLDER}/libicuio51.dll  
-    ${File} ${ROOT_FOLDER}/libicule51.dll  
-    ${File} ${ROOT_FOLDER}/libiculx51.dll  
-    ${File} ${ROOT_FOLDER}/libicutu51.dll  
-    ${File} ${ROOT_FOLDER}/libicuuc51.dll
+    #${File} ${ROOT_FOLDER}/libicudt51.dll 
+    #${File} ${ROOT_FOLDER}/libicuin51.dll  
+    #${File} ${ROOT_FOLDER}/libicuio51.dll  
+    #${File} ${ROOT_FOLDER}/libicule51.dll  
+    #${File} ${ROOT_FOLDER}/libiculx51.dll  
+    #${File} ${ROOT_FOLDER}/libicutu51.dll  
+    #${File} ${ROOT_FOLDER}/libicuuc51.dll
     SetOutPath $INSTDIR\platforms
     ${File} ${ROOT_FOLDER}/platforms/qminimal.dll  
     ${File} ${ROOT_FOLDER}/platforms/qwindows.dll

diff --git a/avidemux/winInstaller/avidemux_crossQt5.nsi b/avidemux/winInstaller/avidemux_crossQt5.nsi
@@ -325,8 +325,8 @@ Section "Avisynth_VapourSynth" SecGrpAvisynth
         SetOverwrite on
         ${File} ${ROOT_FOLDER}/avsproxy.exe
         ${File} ${ROOT_FOLDER}/avsproxy_gui.exe
-        ${File} ${ROOT_FOLDER}/vsProxy.exe
-        ${File} ${ROOT_FOLDER}/vsProxy_gui_qt5.exe
+        # TMP ${File} ${ROOT_FOLDER}/vsProxy.exe
+        # TMP ${File} ${ROOT_FOLDER}/vsProxy_gui_qt5.exe
 SectionEnd
 #
 Section "ShaderDemo" SecShaderDemo