Commit ce82e013 authored by Ingemar Ceicer's avatar Ingemar Ceicer

Windows MinGW 32 64 bit

parent 7711e3e8
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
!define INSTALL_DIR_SUB_NAME2 "iconengines" !define INSTALL_DIR_SUB_NAME2 "iconengines"
!define INSTALL_DIR_SUB_NAME3 "imageformats" !define INSTALL_DIR_SUB_NAME3 "imageformats"
!define INSTALL_DIR_SUB_NAME4 "platforms" !define INSTALL_DIR_SUB_NAME4 "platforms"
# !define INSTALL_DIR_SUB_NAME5 "printsupport" ##!define INSTALL_DIR_SUB_NAME5 "printsupport"
!define INSTALL_DIR_SUB_NAME6 "styles" !define INSTALL_DIR_SUB_NAME6 "styles"
# !define INSTALL_DIR_SUB_NAME7 "help" ##!define INSTALL_DIR_SUB_NAME7 "help"
!define DISPLAY_NAME "LCD" !define DISPLAY_NAME "LCD"
!define PROG_NAME "lcdqt" !define PROG_NAME "lcdqt"
!define VER_NAME "1.0.1" !define VER_NAME "1.0.2"
!define BRANDING_TEXT "Ceicer IT" !define BRANDING_TEXT "Ceicer IT"
...@@ -84,7 +84,7 @@ BGGradient "${BGGRADIENT}" ...@@ -84,7 +84,7 @@ BGGradient "${BGGRADIENT}"
# 64-bit # 64-bit
# InstallDir $PROGRAMFILES64\${INSTALL_DIR_NAME} # InstallDir $PROGRAMFILES64\${INSTALL_DIR_NAME}
# 32-bit # 32-bit
InstallDir $PROGRAMFILES\${INSTALL_DIR_NAME} InstallDir $PROGRAMFILES32\${INSTALL_DIR_NAME}
...@@ -143,22 +143,21 @@ System::Call 'kernel32::GetLocaleInfoA(i 1024, i ${LOCALE_SNATIVELANGNAME}, t .r ...@@ -143,22 +143,21 @@ System::Call 'kernel32::GetLocaleInfoA(i 1024, i ${LOCALE_SNATIVELANGNAME}, t .r
File version_history.en_US File version_history.en_US
File version_history.sv_SE File version_history.sv_SE
File D3Dcompiler_47.dll File D3Dcompiler_47.dll
File libEGL.dll File libEGL.dll
File libgcc_s_dw2-1.dll
File libGLESV2.dll File libGLESV2.dll
File libstdc++-6.dll
File libwinpthread-1.dll
File opengl32sw.dll File opengl32sw.dll
File Qt5Core.dll File Qt5Core.dll
File Qt5Gui.dll File Qt5Gui.dll
File Qt5Network.dll File Qt5Network.dll
File Qt5Svg.dll File Qt5Svg.dll
File Qt5Widgets.dll File Qt5Widgets.dll
File Qt5PrintSupport.dll
File libgcc_s_sjlj-1.dll #MinGW
File libstdc++-6.dll #MinGW
File libwinpthread-1.dll #MinGW
File libgcc_s_dw2-1.dll #MinGW
##File Qt5PrintSupport.dll
SetOutPath $INSTDIR\${INSTALL_DIR_SUB_NAME1} SetOutPath $INSTDIR\${INSTALL_DIR_SUB_NAME1}
File ${INSTALL_DIR_SUB_NAME1}\qgenericbearer.dll File ${INSTALL_DIR_SUB_NAME1}\qgenericbearer.dll
...@@ -176,20 +175,20 @@ System::Call 'kernel32::GetLocaleInfoA(i 1024, i ${LOCALE_SNATIVELANGNAME}, t .r ...@@ -176,20 +175,20 @@ System::Call 'kernel32::GetLocaleInfoA(i 1024, i ${LOCALE_SNATIVELANGNAME}, t .r
File ${INSTALL_DIR_SUB_NAME3}\qtiff.dll File ${INSTALL_DIR_SUB_NAME3}\qtiff.dll
File ${INSTALL_DIR_SUB_NAME3}\qwbmp.dll File ${INSTALL_DIR_SUB_NAME3}\qwbmp.dll
File ${INSTALL_DIR_SUB_NAME3}\qwebp.dll File ${INSTALL_DIR_SUB_NAME3}\qwebp.dll
SetOutPath $INSTDIR\${INSTALL_DIR_SUB_NAME4} SetOutPath $INSTDIR\${INSTALL_DIR_SUB_NAME4}
File ${INSTALL_DIR_SUB_NAME4}\qwindows.dll File ${INSTALL_DIR_SUB_NAME4}\qwindows.dll
#SetOutPath $INSTDIR\${INSTALL_DIR_SUB_NAME5} ##SetOutPath $INSTDIR\${INSTALL_DIR_SUB_NAME5}
#File ${INSTALL_DIR_SUB_NAME5}\windowsprintersupport.dll ##File ${INSTALL_DIR_SUB_NAME5}\windowsprintersupport.dll
SetOutPath $INSTDIR\${INSTALL_DIR_SUB_NAME6} SetOutPath $INSTDIR\${INSTALL_DIR_SUB_NAME6}
File ${INSTALL_DIR_SUB_NAME6}\qwindowsvistastyle.dll File ${INSTALL_DIR_SUB_NAME6}\qwindowsvistastyle.dll
#SetOutPath $INSTDIR\${INSTALL_DIR_SUB_NAME7} ##SetOutPath $INSTDIR\${INSTALL_DIR_SUB_NAME7}
#File ${INSTALL_DIR_SUB_NAME7}\help.html ##File ${INSTALL_DIR_SUB_NAME7}\help.html
#File ${INSTALL_DIR_SUB_NAME7}\help_eng.html ##File ${INSTALL_DIR_SUB_NAME7}\help_eng.html
#File ${INSTALL_DIR_SUB_NAME7}\stilmall.css ##File ${INSTALL_DIR_SUB_NAME7}\stilmall.css
SetOutPath $INSTDIR SetOutPath $INSTDIR
...@@ -246,9 +245,9 @@ SetShellVarContext all ...@@ -246,9 +245,9 @@ SetShellVarContext all
Delete $INSTDIR\${INSTALL_DIR_SUB_NAME2}\*.* Delete $INSTDIR\${INSTALL_DIR_SUB_NAME2}\*.*
Delete $INSTDIR\${INSTALL_DIR_SUB_NAME3}\*.* Delete $INSTDIR\${INSTALL_DIR_SUB_NAME3}\*.*
Delete $INSTDIR\${INSTALL_DIR_SUB_NAME4}\*.* Delete $INSTDIR\${INSTALL_DIR_SUB_NAME4}\*.*
#Delete $INSTDIR\${INSTALL_DIR_SUB_NAME5}\*.* ##Delete $INSTDIR\${INSTALL_DIR_SUB_NAME5}\*.*
Delete $INSTDIR\${INSTALL_DIR_SUB_NAME6}\*.* Delete $INSTDIR\${INSTALL_DIR_SUB_NAME6}\*.*
#Delete $INSTDIR\${INSTALL_DIR_SUB_NAME7}\*.* ##Delete $INSTDIR\${INSTALL_DIR_SUB_NAME7}\*.*
; Remove shortcuts, if any ; Remove shortcuts, if any
...@@ -262,9 +261,9 @@ SetShellVarContext all ...@@ -262,9 +261,9 @@ SetShellVarContext all
RMDir $INSTDIR\${INSTALL_DIR_SUB_NAME2} RMDir $INSTDIR\${INSTALL_DIR_SUB_NAME2}
RMDir $INSTDIR\${INSTALL_DIR_SUB_NAME3} RMDir $INSTDIR\${INSTALL_DIR_SUB_NAME3}
RMDir $INSTDIR\${INSTALL_DIR_SUB_NAME4} RMDir $INSTDIR\${INSTALL_DIR_SUB_NAME4}
#RMDir $INSTDIR\${INSTALL_DIR_SUB_NAME5} ##RMDir $INSTDIR\${INSTALL_DIR_SUB_NAME5}
RMDir $INSTDIR\${INSTALL_DIR_SUB_NAME6} RMDir $INSTDIR\${INSTALL_DIR_SUB_NAME6}
#RMDir $INSTDIR\${INSTALL_DIR_SUB_NAME7} ##RMDir $INSTDIR\${INSTALL_DIR_SUB_NAME7}
RMDir "$INSTDIR" RMDir "$INSTDIR"
RMDir "$PROFILE\.${INSTALL_DIR_NAME}" RMDir "$PROFILE\.${INSTALL_DIR_NAME}"
......
LCD 1.0.1 Copyright (C) 2018 Ingemar Ceicer LCD 1.0.2 Copyright (C) 2018 - 2019 Ingemar Ceicer
programmering1 (at) ceicer (dot) org programmering1 (at) ceicer (dot) org
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
......
D3Dcompiler_47.dll D3Dcompiler_47.dll
install.exe install.exe
lcd.nsi lcd.nsi
lcdqt-1.0.1.exe lcdqt-1.0.2.exe
libEGL.dll libEGL.dll
libgcc_s_dw2-1.dll libgcc_s_dw2-1.dll
libgcc_s_sjlj-1.dll
libGLESV2.dll libGLESV2.dll
libstdc++-6.dll libstdc++-6.dll
libwinpthread-1.dll libwinpthread-1.dll
license.txt license.txt
lista.txt
myapp.ico myapp.ico
opengl32sw.dll opengl32sw.dll
Qt5Core.dll Qt5Core.dll
Qt5Gui.dll Qt5Gui.dll
Qt5Network.dll Qt5Network.dll
Qt5PrintSupport.dll
Qt5Svg.dll Qt5Svg.dll
Qt5Widgets.dll Qt5Widgets.dll
translation_sv_SE.qm translation_sv_SE.qm
......
10:05 February 02, 2019
Version 1.0.2
Improved translation
Bugfixing lcdncursesqt
07:31 October 24, 2018 07:31 October 24, 2018
Version 1.0.1 Version 1.0.1
Opportunity to check for updates Opportunity to check for updates
......
10:05 2 februari 2019
Version 1.0.2
Förbättrad översättning
Buggrättning lcdncursesqt
07:31 24 oktober 2018 07:31 24 oktober 2018
Version 1.0.1 Version 1.0.1
Möjlighet att kolla efter om det finns uppdateringar Möjlighet att kolla efter om det finns uppdateringar
......
...@@ -143,16 +143,20 @@ System::Call 'kernel32::GetLocaleInfoA(i 1024, i ${LOCALE_SNATIVELANGNAME}, t .r ...@@ -143,16 +143,20 @@ System::Call 'kernel32::GetLocaleInfoA(i 1024, i ${LOCALE_SNATIVELANGNAME}, t .r
File version_history.en_US File version_history.en_US
File version_history.sv_SE File version_history.sv_SE
File D3Dcompiler_47.dll
File libEGL.dll
File libgcc_s_seh-1.dll
File libGLESV2.dll
File libstdc++-6.dll File libstdc++-6.dll
File libwinpthread-1.dll File libwinpthread-1.dll
File license.txt
File myapp.ico
File opengl32sw.dll File opengl32sw.dll
File Qt5Core.dll File Qt5Core.dll
File Qt5Gui.dll File Qt5Gui.dll
File Qt5Network.dll File Qt5Network.dll
File Qt5Svg.dll File Qt5Svg.dll
File Qt5Widgets.dll File Qt5Widgets.dll
##File Qt5PrintSupport.dll ##File Qt5PrintSupport.dll
SetOutPath $INSTDIR\${INSTALL_DIR_SUB_NAME1} SetOutPath $INSTDIR\${INSTALL_DIR_SUB_NAME1}
......
D3Dcompiler_47.dll D3Dcompiler_47.dll
install.exe
lcd.nsi
lcdqt-1.0.2.exe lcdqt-1.0.2.exe
libEGL.dll libEGL.dll
libgcc_s_sjlj-1.dll libgcc_s_seh-1.dll
libGLESV2.dll libGLESV2.dll
libstdc++-6.dll libstdc++-6.dll
libwinpthread-1.dll libwinpthread-1.dll
license.txt license.txt
lista.txt
myapp.ico myapp.ico
opengl32sw.dll opengl32sw.dll
Qt5Core.dll Qt5Core.dll
...@@ -13,15 +16,16 @@ Qt5Gui.dll ...@@ -13,15 +16,16 @@ Qt5Gui.dll
Qt5Network.dll Qt5Network.dll
Qt5Svg.dll Qt5Svg.dll
Qt5Widgets.dll Qt5Widgets.dll
translation_sv_SE.qm translation_sv_SE.qm
version_history.en_US version_history.en_US
version_history.sv_SE version_history.sv_SE
bearer\qgenericbearer.dll bearer\qgenericbearer.dll
iconengines\qsvgicon.dll iconengines\qsvgicon.dll
icons\install.ico
icons\uninstall.ico
imageformats\qgif.dll imageformats\qgif.dll
imageformats\qicns.dll imageformats\qicns.dll
imageformats\qico.dll imageformats\qico.dll
...@@ -33,5 +37,4 @@ imageformats\qwbmp.dll ...@@ -33,5 +37,4 @@ imageformats\qwbmp.dll
imageformats\qwebp.dll imageformats\qwebp.dll
platforms\qwindows.dll platforms\qwindows.dll
styles\qwindowsvistastyle.dll styles\qwindowsvistastyle.dll
MinGW MinGW 32
SET PATH=C:\Qt\Qt5.12.1\5.12.1\mingw73_64\bin;%PATH% SET PATH=C:\Qt\Qt5.12.2\Tools\mingw730_32\bin;%PATH%
C:\Qt\Qt5.12.1\5.12.1\mingw73_64\bin\windeployqt.exe SET PATH=C:\Qt\Qt5.12.2\5.12.2\mingw73_32\bin;%PATH%
C:\Qt\Qt5.12.2\5.12.2\mingw73_32\bin\windeployqt.exe
MinGW 64
SET PATH=C:\Qt\Qt5.12.2\Tools\mingw730_64\bin;%PATH%
SET PATH=C:\Qt\Qt5.12.2\5.12.2\mingw73_64\bin;%PATH%
C:\Qt\Qt5.12.2\5.12.2\mingw73_64\bin\windeployqt.exe
MSVC++ MSVC++
SET PATH=C:\Qt\Qt5.12.1\5.12.1\msvc2017_64\bin;%PATH% SET PATH=C:\Qt\Qt5.12.1\5.12.1\msvc2017_64\bin;%PATH%
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment