updating innosetup configuration

CMakeLists.txt

@@ -71,6 +71,7 @@ elseif(UNIX AND NOT APPLE)
 	# cmake -DBUILD_USER_MANUAL=1 -DCMAKE_BUILD_TYPE=Debug
 
 	include(${CMAKE_TOOLCHAINS_PATH}/unix-toolchain.cmake)
+	#include(${CMAKE_TOOLCHAINS_PATH}/unix-toolchain-pappsomsppdev.cmake)
 
 elseif(WIN64)
 	# Run the following cmake command line:

CMakeStuff/toolchains/mxe-toolchain-olivier.cmake

@@ -54,8 +54,8 @@ endif()
 
 
 set(OdsStream_FOUND 1)
-set(OdsStream_INCLUDE_DIRS "/home/olivier/eclipse/git/libodsstream/src")
-set(OdsStream_LIBRARY "/home/olivier/eclipse/git/libodsstream/wbuild/src/libodsstream.dll")
+set(OdsStream_INCLUDE_DIRS "/home/langella/developpement/git/libodsstream/src")
+set(OdsStream_LIBRARY "/home/langella/developpement/git/libodsstream/wbuild/src/libodsstream.dll")
 if(NOT TARGET OdsStream::Core)
     add_library(OdsStream::Core UNKNOWN IMPORTED)
     set_target_properties(OdsStream::Core PROPERTIES
@@ -66,8 +66,8 @@ endif()
 
 
 set(Alglib_FOUND 1)
-set(Alglib_INCLUDE_DIR "/win64/alglib-3.16.0/src")
-set(Alglib_LIBRARY "/win64/alglib-3.16.0/build/libalglib.dll") 
+set(Alglib_INCLUDE_DIR "/home/langella/developpement/git/alglib/src")
+set(Alglib_LIBRARY "/home/langella/developpement/git/alglib/wbuild/libalglib.dll") 
 if(NOT TARGET Alglib::Alglib)
 	add_library(Alglib::Alglib UNKNOWN IMPORTED)
 	set_target_properties(Alglib::Alglib PROPERTIES
@@ -76,15 +76,14 @@ if(NOT TARGET Alglib::Alglib)
 endif()
 
 
-
 # All this belly dance does not seem necessary. Just perform like for the other
 # libraries...
 # Look for the necessary header
-set(Zstd_INCLUDE_DIR /win64/mxe/usr/x86_64-w64-mingw32.shared/include)
+set(Zstd_INCLUDE_DIR /mxe/usr/x86_64-w64-mingw32.shared/include)
 mark_as_advanced(Zstd_INCLUDE_DIR)
 set(Zstd_INCLUDE_DIRS ${Zstd_INCLUDE_DIR})
 # Look for the necessary library
-set(Zstd_LIBRARY /win64/mxe/usr/x86_64-w64-mingw32.shared/bin/libzstd.dll)
+set(Zstd_LIBRARY /mxe/usr/x86_64-w64-mingw32.shared/bin/libzstd.dll)
 mark_as_advanced(Zstd_LIBRARY)
 # Mark the lib as found
 set(Zstd_FOUND 1)
@@ -97,11 +96,14 @@ if(NOT TARGET Zstd::Zstd)
 endif()
 
 
-set(PappsoMSpp_INCLUDE_DIR /home/olivier/eclipse/git/pappsomspp/src/)
+
+
+
+set(PappsoMSpp_INCLUDE_DIR /home/langella/developpement/git/pappsomspp/src/)
 mark_as_advanced(PappsoMSpp_INCLUDE_DIR)
 set(PappsoMSpp_INCLUDE_DIRS ${PappsoMSpp_INCLUDE_DIR})
 # Look for the necessary library
-set(PappsoMSpp_LIBRARY /home/olivier/eclipse/git/pappsomspp/wbuild/src/libpappsomspp.dll)
+set(PappsoMSpp_LIBRARY /home/langella/developpement/git/pappsomspp/wbuild/src/libpappsomspp.dll)
 mark_as_advanced(PappsoMSpp_LIBRARY)
 # Mark the lib as found
 set(PappsoMSpp_FOUND 1)
@@ -112,7 +114,7 @@ if(NOT TARGET PappsoMSpp::Core)
         IMPORTED_LOCATION             "${PappsoMSpp_LIBRARY}"
         INTERFACE_INCLUDE_DIRECTORIES "${PappsoMSpp_INCLUDE_DIRS}")
 endif()
-set(PappsoMSppWidget_LIBRARY /home/olivier/eclipse/git/pappsomspp/wbuild/src/pappsomspp/widget/libpappsomspp-widget.dll)
+set(PappsoMSppWidget_LIBRARY /home/langella/developpement/git/pappsomspp/wbuild/src/pappsomspp/widget/libpappsomspp-widget.dll)
 mark_as_advanced(PappsoMSppWidget_LIBRARY)  
 message(STATUS "~~~~~~~~~~~~~ ${PappsoMSppWidget_LIBRARY} ~~~~~~~~~~~~~~~")
 set(PappsoMSppWidget_FOUND TRUE)

win64/innosetup.bash

 #!/bin/bash
-wine "/home/langella/.wine/drive_c/Program Files/Inno Setup 6/ISCC.exe" xtpcpp-mxe.iss /O /F
+wine "/home/langella/.wine/drive_c/Program Files (x86)/Inno Setup 6/ISCC.exe" xtpcpp-mxe.iss /O /F
 

win64/xtpcpp-mxe.iss.cmake

@@ -45,11 +45,11 @@ WizardImageStretch=yes
 Name: "{app}"
 
 [Files]
-Source: "z:/home/langella/developpement/git/mxe_dll/*"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
-Source: "z:/home/langella/developpement/git/custompwiz/wbuild/src/libcustompwiz.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
-Source: "z:/home/langella/developpement/git/libodsstream/wbuild/src/libodsstream-qt5.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
-Source: "z:/home/langella/developpement/git/pappsomspp/wbuild/src/libpappsomspp-qt5.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
-Source: "z:/home/langella/developpement/git/pappsomspp/wbuild/src/pappsomspp/widget/libpappsomspp-widget-qt5.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
+Source: "z:/win64/mxe_dll/*"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
+Source: "z:/home/langella/developpement/git/libpwizlite/wbuild/src/libpwizlite.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
+Source: "z:/home/langella/developpement/git/libodsstream/wbuild/src/libodsstream.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
+Source: "z:/home/langella/developpement/git/pappsomspp/wbuild/src/libpappsomspp.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
+Source: "z:/home/langella/developpement/git/pappsomspp/wbuild/src/pappsomspp/widget/libpappsomspp-widget.dll"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
 
 Source: "{#sourceDir}\README"; DestDir: {app}; Flags: isreadme; Components: xtpcppComp
 Source: "{#sourceDir}\COPYING"; DestDir: {app}; Flags: isreadme; Components: xtpcppComp