diff --git a/README.md b/README.md index 530fbee..4c7df65 100644 --- a/README.md +++ b/README.md @@ -7,54 +7,18 @@ #### Prerequisites - Visual Studio 2019 -- Qt Visual Studio Tools +- cmake - Qt Library #### Build steps -Open the `sln` and build. - -#### Deployment steps for shared library - -The example here is for deploying an x64 Release build, but other build work analogously. - -Start a `x64 Native Tools Command Prompt for VS 2019`: - ```console -> cd %QTDIR%\msvc2019_64\bin -> set PATH=%PATH%;%CD% -> cd %DEV%\AdaptiveBrightness\AdaptiveBrightness -> windeployqt --no-system-d3d-compiler ..\x64\Release\AdaptiveBrightness.exe +> cmake -G "Visual Studio 16 2019" -A x64 -B build -DCMAKE_PREFIX_PATH="%QTDIR%\msvc2019_64\lib\cmake" ``` -#### Deployment steps for statically linked library +Use the generated `*.sln` to build. -Qt does not provide a statically built library, so this has to be built by hand. The Qt installer for Windows also installs the Qt sources which can be used to build the static library. - -The following batch script sets up the build environment for an x64 build: - -```batch -REM Set up Microsoft Visual Studio 2017, where is amd64, x86, etc. -CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 -SET _ROOT=%QTDIR%\Src_x64 -SET PATH=%_ROOT%\qtbase\bin;%_ROOT%\gnuwin32\bin;%PATH% -REM Uncomment the below line when using a git checkout of the source repository -REM SET PATH=%_ROOT%\qtrepotools\bin;%PATH% -SET _ROOT= -``` - -Then navigate to the source directory and configure the build system: - -```console -> configure -opensource -confirm-license -nomake examples -nomake tests -skip webengine -static -static-runtime -debug-and-release -mp -prefix %QTDIR%\msvc2019_64_static -``` - -And build and install: - -```console -> nmake -> nmake install -``` +There is an additional build step that automatically copies all required DLLs into the output directory for easy deployment. ### Linux @@ -65,7 +29,8 @@ Assumes Debian Buster: `sudo apt install qt5-default libqt5serialport5-dev` #### Build steps ```console -$ qmake CONFIG+=release # or CONFIG+=debug +$ cmake -B build +$ cd build $ make ```