Skip to content

Commit 43b4e73

Browse files
committed
Qt 6.8.1
1 parent 761c9f8 commit 43b4e73

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

build.bat

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
@echo off
22
rem This file is generated from build.pbat, all edits will be lost
3-
set PATH=C:\Program Files\CMake\bin;%LOCALAPPDATA%\Programs\Python\Python311;%LOCALAPPDATA%\Programs\Python\Python311\Scripts;C:\Python311;C:\Python311\Scripts;C:\Program Files\Meson;C:\mingw1120_64\bin;C:\Qt\6.7.3\mingw1120_64\bin;C:\Qwt-6.3.0-dev\lib;%PATH%
3+
set PATH=C:\Program Files\CMake\bin;%LOCALAPPDATA%\Programs\Python\Python311;%LOCALAPPDATA%\Programs\Python\Python311\Scripts;C:\Python311;C:\Python311\Scripts;C:\mingw1310_64\bin;C:\Qt\6.8.1\mingw_64\bin;C:\Qwt-6.3.0-Qt-6.8.1\lib;%PATH%
4+
where ninja > NUL 2>&1 || pip install ninja
45
set BUILD_TYPE=Release
56
if /I "%1"=="debug" set BUILD_TYPE=Debug
67
echo BUILD_TYPE %BUILD_TYPE%
78
pushd %~dp0
89
if not exist "%BUILD_TYPE%" mkdir "%BUILD_TYPE%"
910
pushd %BUILD_TYPE%
10-
cmake -G Ninja -D CMAKE_BUILD_TYPE=%BUILD_TYPE% -D CMAKE_PREFIX_PATH=C:/Qwt-6.3.0-dev ..
11+
cmake -G Ninja -D CMAKE_BUILD_TYPE=%BUILD_TYPE% -D CMAKE_PREFIX_PATH=C:/Qwt-6.3.0-Qt-6.8.1 ..
1112
cmake --build .
1213
popd
1314
popd

build.pbat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
def main
22
include(env)
3+
install(ninja)
34
set BUILD_TYPE=Release
45
if /I "%1"=="debug" set BUILD_TYPE=Debug
56
echo BUILD_TYPE %BUILD_TYPE%
67
pushd_cd()
78
mkdir(%BUILD_TYPE%)
89
pushd %BUILD_TYPE%
9-
cmake -G Ninja -D CMAKE_BUILD_TYPE=%BUILD_TYPE% -D CMAKE_PREFIX_PATH=C:/Qwt-6.3.0-dev ..
10+
cmake -G Ninja -D CMAKE_BUILD_TYPE=%BUILD_TYPE% -D CMAKE_PREFIX_PATH=C:/Qwt-6.3.0-Qt-6.8.1 ..
1011
cmake --build .
1112
popd
1213
popd

env.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
22
rem This file is generated from env.pbat, all edits will be lost
3-
set PATH=C:\Program Files\CMake\bin;%LOCALAPPDATA%\Programs\Python\Python311;%LOCALAPPDATA%\Programs\Python\Python311\Scripts;C:\Python311;C:\Python311\Scripts;C:\Program Files\Meson;C:\mingw1120_64\bin;C:\Qt\6.7.3\mingw1120_64\bin;C:\Qwt-6.3.0-dev\lib;%PATH%
3+
set PATH=C:\Program Files\CMake\bin;%LOCALAPPDATA%\Programs\Python\Python311;%LOCALAPPDATA%\Programs\Python\Python311\Scripts;C:\Python311;C:\Python311\Scripts;C:\mingw1310_64\bin;C:\Qt\6.8.1\mingw_64\bin;C:\Qwt-6.3.0-Qt-6.8.1\lib;%PATH%

env.pbat

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use(cmake)
22
use(python, 3.11)
3-
use(ninja)
4-
add_path(C:\mingw1120_64\bin)
5-
add_path(C:\Qt\6.7.3\mingw1120_64\bin)
6-
add_path(C:\Qwt-6.3.0-dev\lib)
3+
add_path(C:\mingw1310_64\bin)
4+
add_path(C:\Qt\6.8.1\mingw_64\bin)
5+
add_path(C:\Qwt-6.3.0-Qt-6.8.1\lib)

version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#define VERSION "0.0.1"
2-
#define GIT_COMMIT_HASH "2adf72d06cad702941370593b24699be49c37324"
2+
#define GIT_COMMIT_HASH "34a0054127533d96211ab3b74ef2e73a07b0008c"

0 commit comments

Comments
 (0)