diff --git a/README.Windows b/README.Windows index 48c8d24a3..65d4d2614 100644 --- a/README.Windows +++ b/README.Windows @@ -20,16 +20,18 @@ MinGW Qt 5.9 git cygwin (optional) - if you want to debug, you'll need gdb from cygwin. +cmake (optional) Microsoft Tools Build: ------------------------------------ Visual C++ Qt 5.9 git +cmake (optional) Installer build: ------------------------------------ -Inno Setup 5 +Inno Setup 6 Also, you'll need to make sure the following things are set appropriately @@ -74,12 +76,27 @@ working executable... projects (the minimum projects which are part of a standard Quackle install). +NEW BUILD SYSTEM COMING +----------------------- +Quackle 1.0.4 was built with cmake and vcpkg. This very much lowers the barrier +to getting a build up and running. Basic outline: + +* Install qt5 in vcpkg (note vcpkg defaults to 32-bit, so tell it if you want + 64-bit) +* Set environment variable Qt5DIR=\installed\\share\cmake\Qt5 +* Run cmake pointing to the quacker/ directory +* Build from cmake as usual or, if you built using Visual Studio, you can open the + generated solution file + +More detailed instructions coming later. + + Additional things to know: -------------------------- * To build the Quackle installer, - + Copy Qt5Core.dll, Qt5Widgets.dll and Qt5Gui.dll from Qt's bin/ directory into quackle\ - + If you're building with MinGW, copy mingwm10.dll, libstdc++-6.dll, and - libgcc_s_dw2-1.dll from MinGW's bin/ directory into quackle\ + + Run a cmake build in quacker\build + + Build the RelWithDebInfo build + + Copy any needed DLLs into build\RelWithDebInfo + From the Quackle directory, run the following... installer.iss /FQuackleInstaller /O. /Q + Find the file QuackleInstaller.exe in the quackle\ directory. diff --git a/installer.iss b/installer.iss index 44873f2cf..988365eb6 100644 --- a/installer.iss +++ b/installer.iss @@ -4,7 +4,9 @@ [Setup] AppName=Quackle AppVerName=Quackle 1.0.4 -DefaultDirName={pf}\Quackle +ArchitecturesAllowed=x64 +ArchitecturesInstallIn64BitMode=x64 +DefaultDirName={commonpf}\Quackle DefaultGroupName=Quackle ChangesAssociations=yes UninstallDisplayIcon={app}\Quackle.exe @@ -21,11 +23,13 @@ Root: HKCR; Subkey: "QuackleGameFile\shell\open\command"; ValueType: string; Val [Files] -Source: "quacker\release\Quackle.exe"; DestDir: "{app}" +Source: "quacker\build\RelWithDebInfo\Quackle.exe"; DestDir: "{app}" Source: "LICENSE"; DestDir: "{app}" -Source: "Qt5Core.dll"; DestDir: "{app}" -Source: "Qt5Gui.dll"; DestDir: "{app}" -Source: "Qt5Widgets.dll"; DestDir: "{app}" +Source: "quacker\build\RelWithDebInfo\*.dll"; DestDir: "{app}" +; Assuming either a cmake process or a human copied the DLL files +; in the same dir. Right now, I'm building from vcpkg, and the list of DLLs +; is Qt5Core, Qt5Gui, Qt5Widgets, zlib1, bz2, freetype, harfbuzz, libpng16, pcre2-16. +; But, depending upon your build chain, this will vary. -jfultz Source: "data\themes\*"; DestDir: "{app}\data\themes" Source: "data\alphabets\*"; DestDir: "{app}\data\alphabets"