Skip to content

Commit

Permalink
Change static config to use standard name
Browse files Browse the repository at this point in the history
  • Loading branch information
fpoussin committed Mar 16, 2020
1 parent 4789832 commit 9cc5a50
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ make install
Alternatively build as static library (best for portability)
```shell
mkdir build && cd build
qmake CONFIG+=static_lib ..
qmake CONFIG+=staticlib ..
make install
```

Expand Down
2 changes: 1 addition & 1 deletion build_msvc.bat
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ SET PROJDIR=%CD%
SET BUILDDIR=%PROJDIR%\..\build-qtusb-%ARCH%

SET STATIC=""
IF "%LIBTYPE%" == "static" SET STATIC="CONFIG+=static_lib"
IF "%LIBTYPE%" == "static" SET STATIC="CONFIG+=staticlib"

CALL "C:\Program Files (x86)\Microsoft Visual Studio\%MSVC%\Community\VC\Auxiliary\Build\vcvarsall.bat" %vcarch%

Expand Down
3 changes: 1 addition & 2 deletions src/usb/usb.pro
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ DEFINES += QT_BUILD_USB_LIB

include($$PWD/usb-lib.pri)

CONFIG(static_lib) {
CONFIG(staticlib) {
message("Build as Qt module (static library)")
CONFIG += staticlib
} else {
message("Build as Qt module (dynamic library)")
}
Expand Down

0 comments on commit 9cc5a50

Please sign in to comment.