fix makefile
the build was successful
Details
the build was successful
Details
This commit is contained in:
parent
07cbb1054b
commit
8e6f5e813a
30
Makefile
30
Makefile
|
@ -1,51 +1,33 @@
|
||||||
.PHONY: all clean linux windows android
|
.PHONY: all clean linux windows android
|
||||||
all: clean linux windows android
|
|
||||||
default: linux
|
DEFAULT_GOAL: linux
|
||||||
|
|
||||||
SHELL := env QT_BUILD_VERSION=$(QT_BUILD_VERSION) $(SHELL)
|
SHELL := env QT_BUILD_VERSION=$(QT_BUILD_VERSION) $(SHELL)
|
||||||
QT_BUILD_VERSION ?= "5.13.4"
|
QT_BUILD_VERSION ?= "5.13.4"
|
||||||
|
|
||||||
|
all: clean linux windows android
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -r vendor || true
|
rm -r vendor || true
|
||||||
find -type f -iname "moc*" | xargs rm
|
find -type f -iname "moc*" | xargs rm
|
||||||
find -iname "rcc*" | xargs rm
|
find -iname "rcc*" | xargs rm
|
||||||
|
|
||||||
linux:
|
linux:
|
||||||
$(MAKE) linux_build || $(MAKE) linux_clean
|
|
||||||
|
|
||||||
windows:
|
|
||||||
$(MAKE) windows_build || $(MAKE) windows_clean
|
|
||||||
|
|
||||||
android:
|
|
||||||
$(MAKE) android_build || $(MAKE) android_clean
|
|
||||||
|
|
||||||
linux_build:
|
|
||||||
date
|
date
|
||||||
qtdeploy -qt_version $(QT_BUILD_VERSION) build linux 2>&1 | tee qtdeploy.log | pv
|
qtdeploy -qt_version $(QT_BUILD_VERSION) build linux 2>&1 | tee qtdeploy.log | pv
|
||||||
date
|
date
|
||||||
cp -R assets deploy/linux/
|
cp -R assets deploy/linux/
|
||||||
$(MAKE) linux_clean
|
|
||||||
|
|
||||||
linux_clean:
|
windows:
|
||||||
#ntd
|
|
||||||
|
|
||||||
windows_build:
|
|
||||||
date
|
date
|
||||||
qtdeploy -qt_version $(QT_BUILD_VERSION) build windows 2>&1 | tee qtdeploy.log | pv
|
qtdeploy -qt_version $(QT_BUILD_VERSION) build windows 2>&1 | tee qtdeploy.log | pv
|
||||||
date
|
date
|
||||||
cp -R assets deploy/windows/
|
cp -R assets deploy/windows/
|
||||||
$(MAKE) linux_clean
|
|
||||||
|
|
||||||
windows_clean:
|
android:
|
||||||
#ntd
|
|
||||||
|
|
||||||
android_build:
|
|
||||||
cp -R assets android/
|
cp -R assets android/
|
||||||
date
|
date
|
||||||
## TODO have this also include AndroidExtras (see ANDROID_DEBUGGING) for full notes.
|
## TODO have this also include AndroidExtras (see ANDROID_DEBUGGING) for full notes.
|
||||||
env ANDROID_MODULES_INCLUDE="Core,Gui,Svg,QuickWidgets,Xml" qtdeploy -debug -qt_version $(QT_BUILD_VERSION) build android 2>&1 | tee qtdeploy.log | pv
|
env ANDROID_MODULES_INCLUDE="Core,Gui,Svg,QuickWidgets,Xml" qtdeploy -debug -qt_version $(QT_BUILD_VERSION) build android 2>&1 | tee qtdeploy.log | pv
|
||||||
date
|
date
|
||||||
|
|
||||||
android_clean:
|
|
||||||
mv android/assets assets
|
|
||||||
|
|
||||||
|
|
Reference in New Issue