diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -8,7 +8,7 @@ LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) VERSION_SHORT=5.13 -VERSION_RELEASE=1 +VERSION_RELEASE=2 VERSION=$(VERSION_SHORT).$(VERSION_RELEASE) SSL_VERSION=1.0.2r @@ -16,7 +16,7 @@ SSL_ARCHIVE=openssl-$(SSL_VERSION).tar.gz PACKAGE_NAME = qt-$(VERSION) -GCC_PATH ?= /opt/dev-tools/gcc-suite/1.3.0/x86-linux64/gcc-8.2.0 +GCC_PATH ?= /opt/dev-tools/gcc-suite/1.5.0/x86-linux64/gcc CC ?= $(GCC_PATH)/bin/gcc CXX ?= $(GCC_PATH)/bin/g++ @@ -65,7 +65,7 @@ ssl.$(ARCH): make -j$(JOBS) && \ make install -qt.x86-linux64: qt.x86-linux64.shared qt.x86-linux64.static merge +qt.x86-linux64: qt.x86-linux64.shared qt.x86-linux64.static qt.x86-linux64.shared: # shared @@ -150,10 +150,10 @@ qt.x86-linux64.static: cd $(LOCAL_INST_PATH)/qt-$(VERSION)-static && \ tar -zcf $(TOP)/qt-$(VERSION)-static-$(ARCH).tgz ./ merge: - cp -nr $(LOCAL_INST_PATH)/qt-$(VERSION)-static/lib/* $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/lib/ - cp -nr $(LOCAL_INST_PATH)/qt-$(VERSION)-static/plugins/* $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/plugins/ - cp -nr $(LOCAL_INST_PATH)/qt-$(VERSION)-static/qml/* $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/qml/ - cd $(LOCAL_INST_PATH)/qt-$(VERSION)-shared && \ + #cp -nr $(LOCAL_INST_PATH)/qt-$(VERSION)-static/lib/* $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/lib/ + #cp -nr $(LOCAL_INST_PATH)/qt-$(VERSION)-static/plugins/* $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/plugins/ + #cp -nr $(LOCAL_INST_PATH)/qt-$(VERSION)-static/qml/* $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/qml/ + #cd $(LOCAL_INST_PATH)/qt-$(VERSION)-shared && \ tar -zcf $(TOP)/qt-$(VERSION)-$(ARCH).tgz ./ clean: |