Update Windows packages

CMakeLists.txt

@@ -26,14 +26,14 @@ string(TOLOWER ${CMAKE_PROJECT_NAME} CMAKE_BIN_NAME)
 # -----------------------------------------------------------------------------
 # wxWidgets
 # -----------------------------------------------------------------------------
-find_package(wxWidgets REQUIRED)
-
 if(WIN32)
-    set(wxWidgets_ROOT_DIR "C:/wxWidgets-3.1.1")
-    set(wxWidgets_LIB_DIR "C:/wxWidgets-3.1.1/lib/gcc810_dll")
+    set(wxWidgets_ROOT_DIR "C:/wxMSW-3.2.4_gcc810_Dev")
+    set(wxWidgets_LIB_DIR "C:/wxMSW-3.2.4_gcc810_Dev/lib/gcc810_dll")
     set(wxWidgets_CONFIGURATION mwsu)
 endif()
 
+find_package(wxWidgets REQUIRED)
+
 include(${wxWidgets_USE_FILE})
 
 # -----------------------------------------------------------------------------
@@ -166,7 +166,7 @@ file(GLOB SRC_FILES
 
 # Compile the main executable
 if(WIN32)
-    set(SRC_FILES ${SRC_FILES} windows/resource.rc)
+    set(SRC_FILES ${SRC_FILES} packaging/windows/resource.rc)
 
     # Add the executable with a WinMain entry point on Windows.
     # See https://cmake.org/cmake/help/latest/prop_tgt/WIN32_EXECUTABLE.html
@@ -184,12 +184,12 @@ target_link_libraries(${CMAKE_BIN_NAME} ${wxWidgets_LIBRARIES})
 # Define the file locations during install process
 if(WIN32)
     install(TARGETS ${CMAKE_BIN_NAME} DESTINATION "/")
-    install(DIRECTORY "${CMAKE_DATA_DIR}" DESTINATION "${CMAKE_DATA_DIR}")
+    install(DIRECTORY "${CMAKE_DATA_DIR}" DESTINATION "/")
     install(FILES "${CMAKE_DOC_DIR}/CHANGELOG.md" DESTINATION "/" RENAME "Changelog.txt")
     install(FILES "${CMAKE_DOC_DIR}/COPYING" DESTINATION "/" RENAME "License.txt")
     install(FILES "${CMAKE_DOC_DIR}/README.md" DESTINATION "/" RENAME "Readme.txt")
-    install(FILES "C:/wxWidgets-3.1.1/lib/gcc810_dll/wxmsw313u_core_gcc810.dll" DESTINATION "/")
-    install(FILES "C:/wxWidgets-3.1.1/lib/gcc810_dll/wxbase313u_gcc810.dll" DESTINATION "/")
+    install(FILES "C:/wxMSW-3.2.4_gcc810_Dev/lib/gcc810_dll/wxmsw32u_core_gcc810.dll" DESTINATION "/")
+    install(FILES "C:/wxMSW-3.2.4_gcc810_Dev/lib/gcc810_dll/wxbase32u_gcc810.dll" DESTINATION "/")
 else()
     install(TARGETS ${CMAKE_BIN_NAME} DESTINATION "bin")
     install(DIRECTORY "${CMAKE_DATA_DIR}/" DESTINATION "share/${CMAKE_BIN_NAME}/${CMAKE_DATA_DIR}")

README.md

@@ -29,7 +29,7 @@ Alternatively to downloading the pre-compiled binaries, you can build the applic
 
 #### Linux
 
-This section assumes you are using Ubuntu 20.04 (Focal Fossa), but the procedure is similar for other Linux distributions.
+This section assumes you are using Ubuntu 24.04, but the procedure is similar for other Linux distributions.
 
 The prerequisites to build the source is to install the following packages:
 
@@ -52,8 +52,8 @@ sudo make install
 This section assumes Windows 10, but the procedure is similar for other Windows versions. The prerequisites to build the source is to install the following dependencies:
 
 - [MinGW-W64 GCC-8.1.0](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/8.1.0/threads-posix/sjlj/i686-8.1.0-release-posix-sjlj-rt_v6-rev0.7z) - i686-posix-sjlj
-- [wxWidgets 3.1.3](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.3/wxWidgets-3.1.3-headers.7z) - header files ('include' folder)
-- [wxWidgets 3.1.3](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.3/wxMSW-3.1.3_gcc810_Dev.7z) - development files for MinGW GCC 8.1.0 ('lib' folder)
+- [wxWidgets 3.2.4](https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.4/wxWidgets-3.2.4-headers.7z) - header files ('include' folder)
+- [wxWidgets 3.2.4](https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.4/wxMSW-3.2.4_gcc810_Dev.7z) - development files for MinGW GCC 8.1.0 ('lib' folder)
 - [Gettext](https://mlocati.github.io/articles/gettext-iconv-windows.html) - 32 bit, static
 - [CMake](https://cmake.org/download/)
 
@@ -63,7 +63,8 @@ Compile the sources and install with following commands in the terminal:
 mkdir build
 cd build
 cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX:PATH=dist ..
-cmake --build . --tar
+cmake --build .
+cmake --install .
 ```
 
 To create an installer on Windows, which is optional, the [Inno Setup](http://www.jrsoftware.org/isinfo.php) must to be downloaded and installed.

packaging/windows/installer.iss.in

@@ -19,28 +19,27 @@ AppSupportURL={#ApplicationSite}
 AppUpdatesURL={#ApplicationSite}
 DefaultDirName={pf}\{#ApplicationName}
 DefaultGroupName={#ApplicationName}
-LicenseFile=build\License.txt
+LicenseFile=..\..\build\dist\License.txt
 OutputBaseFilename=${CMAKE_BIN_NAME}-{#ApplicationVersion}-win32-setup
 Compression=lzma
 SolidCompression=yes
 OutputDir=.
 
 [Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
 Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
+Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "german"; MessagesFile: "compiler:Languages\German.isl"
 Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
 Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
 Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
-Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
 Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}";
 
 [Files]
-Source: "build\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\..\build\dist\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 [Icons]
 Name: "{group}\${CMAKE_PROJECT_NAME}"; Filename: "{app}\${CMAKE_BIN_NAME}.exe"