Several Build Fixes; Added Makefile for QtCreator

Switched back to "desktop" (instead of es2) opengl for windows

Change-Id: Ibac9aa35a40ede332dfa6ccce1b1611d6e3cf044

4 files changed, 95 insertions, 15 deletions

diff --git a/Jenkinsfile b/Jenkinsfile
index 493f008..a6b8a66 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -48,7 +48,8 @@ stage('Build') {
         		    userRemoteConfigs: [[url: REPO]]])
 
 		    stage ("Windows 64 Bit MinGW Build") {
-			sh '''
+			sh ''''#!/bin/bash
+			    set -x
 			    echo "Cleanup prev. builds ..."
 			    WS=$(cygpath $WORKSPACE)
 			    rm -f openssl-1.0.2r/NUL
@@ -67,11 +68,12 @@ stage('Build') {
 			'''
 		    }
 		    stage ("Windows 64 Bit MSVC Build") {
-			sh '''
+			sh '''#!/bin/bash
+			    set -x
 			    rm -f openssl-1.0.2r/NUL
 			    rm -Rf openssl-1.0.2r
 			'''
-			bat '''@echo off
+			bat '''
 			    set SDKDIR=C:\\dev-tools\\WinSDK\\VS2019BT\\
 			    set NASMDIR=C:\\dev-tools\\nasm\\2.12.01_64
 			    set MSYSDIR=C:\\dev-tools\\msys\\x86\\
diff --git a/Makefile b/Makefile
index fa9185c..221b3d6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 TOP = $(shell readlink -f .)
 ARCH	= x86-linux64
 
-JOBS = 2
+JOBS = -j2
 
 LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH)
 LOCAL_INST_PATH = $(TOP)/install.$(ARCH)
@@ -18,11 +18,11 @@ PACKAGE_NAME = qt-$(VERSION)
 
 GCC_PATH	?= /opt/dev-tools/gcc-suite/1.3.0/x86-linux64/gcc-8.2.0
 
-CC	?= $(GCC_PATH)/bin/gcc 
-CXX	?= $(GCC_PATH)/bin/g++ 
+CC	= $(GCC_PATH)/bin/gcc 
+CXX	= $(GCC_PATH)/bin/g++ 
 
-#CC_LDFLAGS	= "-m64 -shared -fpic -static-libgcc"
-#CXX_LDFLAGS	= "-m64 -shared -fpic -static-libgcc -static-libstdc++"
+#CC_LDFLAGS	= -m64 -shared -fpic -static-libgcc
+#CXX_LDFLAGS	= $(CC_LDFLAGS) -static-libstdc++
 
 QT_STATIC_FLAGS = -static -static-runtime -no-shared
 
@@ -47,7 +47,7 @@ ssl.$(ARCH):
 	    ./Configure -static-libgcc -static-libstdc++ --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \
 	    pwd && \
 	    make clean && \
-	    make -j$(JOBS) && \
+	    make $(JOBS) && \
 	    make install
 	# shared
 	rm -Rf $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION)
@@ -62,7 +62,7 @@ ssl.$(ARCH):
 	    ./Configure -static-libgcc -static-libstdc++ shared --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \
 	    pwd && \
 	    make clean && \
-	    make -j$(JOBS) && \
+	    make $(JOBS) && \
 	    make install
 
 qt.x86-linux64: qt.x86-linux64.shared qt.x86-linux64.static merge
@@ -88,6 +88,7 @@ qt.x86-linux64.shared:
 		-opensource \
 		-strip \
 		-ssl \
+		-gtk \
 		-openssl \
 		-I$(LOCAL_INST_PATH)/openssl/include \
 		-L$(LOCAL_INST_PATH)/openssl/lib \
@@ -103,8 +104,8 @@ qt.x86-linux64.shared:
 		-fontconfig \
 		-system-freetype \
 		-confirm-license && \
-	make -j$(JOBS) && \
-	make -j$(JOBS) install
+	make $(JOBS) && \
+	make $(JOBS) install
 	cp -f $(TOP)/qt.conf $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/bin/
 	cd  $(LOCAL_INST_PATH)/qt-$(VERSION)-shared && \
 	    tar -zcf $(TOP)/qt-$(VERSION)-shared-$(ARCH).tgz ./
@@ -144,8 +145,8 @@ qt.x86-linux64.static:
 		-fontconfig \
 		-system-freetype \
 		-confirm-license && \
-	make -j$(JOBS) && \
-	make -j$(JOBS) install
+	make $(JOBS) && \
+	make $(JOBS) install
 	cp -f $(TOP)/qt.conf $(LOCAL_INST_PATH)/qt-$(VERSION)-static/bin/
 	cd  $(LOCAL_INST_PATH)/qt-$(VERSION)-static && \
 	    tar -zcf $(TOP)/qt-$(VERSION)-static-$(ARCH).tgz ./
diff --git a/Makefile.mingw64 b/Makefile.mingw64
index d7cc664..74926ce 100644
--- a/Makefile.mingw64
+++ b/Makefile.mingw64
@@ -80,7 +80,7 @@ qt.$(ARCH):
 			-qt-libpng \
 			-qt-pcre \
 			-qt-freetype \
-			-opengl es2 \
+			-opengl desktop \
 			-openssl \
 			-I$(QT_INST_PATH)/include \
 			-L$(QT_INST_PATH)/lib \
diff --git a/Makefile.qtcreator b/Makefile.qtcreator
new file mode 100644
index 0000000..1186e6a
--- /dev/null
+++ b/Makefile.qtcreator
@@ -0,0 +1,77 @@
+TOP			= $(shell readlink -f .)
+ARCH			= x86-linux64
+GIT_URL			= https://github.com/qt-creator/qt-creator.git
+VERSION_SHORT		= 4.10
+VERSION_RELEASE		= 1
+
+GIT_TAG			= v$(VERSION_SHORT).$(VERSION_RELEASE)
+JOBS 			= -j2
+
+LOCAL_BUILD_PATH 	= $(TOP)/build-qt-creator.$(ARCH)
+LOCAL_INST_PATH 	= $(TOP)/install-qt-creator.$(ARCH)
+
+QT_VER			= 5.13.1
+
+
+VERSION=$(VERSION_SHORT).$(VERSION_RELEASE)
+
+PACKAGE_NAME = qt-creator-$(VERSION)
+
+CC_LDFLAGS	= -m64 -shared -fpic -static-libgcc
+CXX_LDFLAGS	= $(CC_LDFLAGS) -static-libstdc++
+
+ifeq ($(DEV_TOOLS),)
+    $(error DEV_TOOLS variable not set)
+endif
+
+ifeq ($(ARCH),x86-linux64)
+QTDIR		= $(DEV_TOOLS)/Qt/$(QT_VER)/$(ARCH)-shared
+QT_SPEC		= linux-g++-64
+GCC_PATH	= $(DEV_TOOLS)/gcc-suite/1.4.0/x86-linux64/gcc-9.1.0
+QMAKE		= $(QTDIR)/bin/qmake
+endif
+
+ifeq ($(ARCH),x86-mingw64)
+QTDIR		= $(DEV_TOOLS)/Qt/$(QT_VER)/$(ARCH)
+QT_SPEC		= x-win32-g++
+CROSS_PLATFORM	= x86_64-w64-mingw32
+CROSS_PREFIX	= $(CROSS_PLATFORM)-
+GCC_PATH	= $(DEV_TOOLS)/gcc-suite/1.4.0/x86-linux64/mingw64
+QMAKE		= $(QTDIR)/xbin/qmake
+endif
+
+all: clone build.$(ARCH) pack
+
+clone:
+	rm -Rf $(LOCAL_BUILD_PATH) ;\
+	mkdir -p $(LOCAL_BUILD_PATH) ;\
+	cd $(LOCAL_BUILD_PATH) ;\
+	git clone $(GIT_URL) $(PACKAGE_NAME) ;\
+	cd $(PACKAGE_NAME)  ;\
+	git checkout $(GIT_TAG) ;\
+
+build.x86-linux64:
+	export PATH=$(QTDIR)/bin:$(GCC_PATH)/bin:$(PATH) ;\
+	export LDFLAGS="$(CXX_LDFLAGS)" ;\
+	qmake --version ;\
+	g++ --version ;\
+	cd $(LOCAL_BUILD_PATH)/$(PACKAGE_NAME) ;\
+	    qmake -r && \
+	    make $(JOBS) && \
+	    make install INSTALL_ROOT=$(LOCAL_INST_PATH)
+
+build.x86-mingw64:
+	export PATH=$(QTDIR)/xbin:$(GCC_PATH)/bin:$(PATH) ;\
+	export CROSS_COMPILE=$(CROSS_PREFIX) ;\
+	export LD_LIBRARY_PATH=$(QTDIR)/lib:$(LD_LIBRARY_PATH); \
+	export LDFLAGS="$(CXX_LDFLAGS)" ;\
+	cd $(LOCAL_BUILD_PATH)/$(PACKAGE_NAME) ;\
+	    qmake -r && \
+	    make $(JOBS) && \
+	    make install INSTALL_ROOT=$(LOCAL_INST_PATH)
+
+
+pack:
+	cd $(LOCAL_INST_PATH) ;\
+	    tar -zcf $(TOP)/$(PACKAGE_NAME)-$(ARCH).tgz .
+