mirror of
https://github.com/rizinorg/cutter.git
synced 2024-12-22 21:06:10 +00:00
Some little fixes (#411)
This commit is contained in:
parent
2c726205c4
commit
b14be4acb2
@ -51,7 +51,7 @@ before_build:
|
|||||||
|
|
||||||
# Build config
|
# Build config
|
||||||
build_script:
|
build_script:
|
||||||
- cmd: if defined QMAKE ( call prepare_r2.bat && call build.bat CUTTER_ENABLE_JUPYTER CUTTER_ENABLE_QTWEBENGINE )
|
- cmd: if defined QMAKE ( call prepare_r2.bat && call build.bat )
|
||||||
- cmd: if defined MESON ( python meson.py --dist=%ARTIFACT_PATH% --backend=%BACKEND% --jupyter --webengine )
|
- cmd: if defined MESON ( python meson.py --dist=%ARTIFACT_PATH% --backend=%BACKEND% --jupyter --webengine )
|
||||||
|
|
||||||
after_build:
|
after_build:
|
||||||
|
@ -16,7 +16,7 @@ MKDIR build%BITS%
|
|||||||
CD build%BITS%
|
CD build%BITS%
|
||||||
|
|
||||||
ECHO Building cutter
|
ECHO Building cutter
|
||||||
qmake "CONFIG+=%*" ..\src\cutter.pro -config release -tp vc
|
qmake %* ..\src\cutter.pro -config release -tp vc
|
||||||
IF !ERRORLEVEL! NEQ 0 EXIT /B 1
|
IF !ERRORLEVEL! NEQ 0 EXIT /B 1
|
||||||
msbuild /m cutter.vcxproj /p:Configuration=Release;Platform=%MSBUILDPLATFORM%
|
msbuild /m cutter.vcxproj /p:Configuration=Release;Platform=%MSBUILDPLATFORM%
|
||||||
IF !ERRORLEVEL! NEQ 0 EXIT /B 1
|
IF !ERRORLEVEL! NEQ 0 EXIT /B 1
|
||||||
|
@ -15,7 +15,9 @@ CONFIG += c++11
|
|||||||
equals(CUTTER_ENABLE_JUPYTER, true) CONFIG += CUTTER_ENABLE_JUPYTER
|
equals(CUTTER_ENABLE_JUPYTER, true) CONFIG += CUTTER_ENABLE_JUPYTER
|
||||||
|
|
||||||
!defined(CUTTER_ENABLE_QTWEBENGINE, var) CUTTER_ENABLE_QTWEBENGINE=true
|
!defined(CUTTER_ENABLE_QTWEBENGINE, var) CUTTER_ENABLE_QTWEBENGINE=true
|
||||||
equals(CUTTER_ENABLE_QTWEBENGINE, true) CONFIG += CUTTER_ENABLE_QTWEBENGINE
|
equals(CUTTER_ENABLE_JUPYTER, true) {
|
||||||
|
equals(CUTTER_ENABLE_QTWEBENGINE, true) CONFIG += CUTTER_ENABLE_QTWEBENGINE
|
||||||
|
}
|
||||||
|
|
||||||
# Define the preprocessor macro to get the application version in our application.
|
# Define the preprocessor macro to get the application version in our application.
|
||||||
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
|
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
|
||||||
|
Loading…
Reference in New Issue
Block a user