Mercurial > hg > syntilista

changeset 257:f65e0de45c2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename the MinGW cross-build Makefile as it is no longer win32 only.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Dec 2019 03:17:24 +0200
parents 2bb7ae9816bb
children daaad6ad8212
files Makefile.cross-mingw Makefile.cross-mingw-win32 build-win32.sh
diffstat 3 files changed, 63 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.cross-mingw	Thu Dec 05 03:17:24 2019 +0200
@@ -0,0 +1,62 @@
+###
+### For win32 version cross-compilation with MinGW suite @ Linux
+###
+USE_QTHTTP ?= yes
+
+ifeq ($(MINGW),64)
+BINTOOL_PREFIX ?= x86_64-w64-mingw32-
+MINGW_SYS_PATH ?= /usr/x86_64-w64-mingw32
+MINGW_LOCAL_PATH ?= /usr/local/x86_64-w64-mingw32
+OBJPATH ?= ./obj/win64/
+else
+BINTOOL_PREFIX ?= i686-w64-mingw32-
+MINGW_SYS_PATH ?= /usr/i686-w64-mingw32
+MINGW_LOCAL_PATH ?= /usr/local/i686-w64-mingw32
+OBJPATH ?= ./obj/win32/
+endif
+
+PREFIX =
+EXEEXT = .exe
+
+# Miscellaneous
+QT5_MODULES = Core Gui Widgets Sql PrintSupport
+QT5_PREFIX ?= /misc/packages/qt5-src
+QT5_BASE ?= $(QT5_PREFIX)/qtbase
+
+# Compiler flags and linker flags
+DEFINES = -DUNICODE -DQT_NEEDS_QMAIN
+ifeq ($(USE_QTHTTP),yes)
+QT5_MODULES += Network
+DEFINES += -DUSE_QTHTTP
+endif
+INCPATH = -I. \
+	-I$(QT5_BASE)/include \
+	$(addprefix -I$(QT5_BASE)/include/Qt,$(QT5_MODULES)) \
+	-I$(QT5_MULTIMEDIA)/include \
+	-I$(QT5_BASE)/mkspecs/win32-g++
+
+CFLAGS += -pipe -fno-keep-inline-dllexport
+CXXFLAGS += -pipe -fno-keep-inline-dllexport -frtti -fexceptions -mthreads
+LDFLAGS += -Wl,-s -Wl,-subsystem,windows -mthreads
+
+APP_LIBS = -lglu32 -lopengl32 -lgdi32 -luser32 -lmingw32 \
+	-L$(QT5_BASE)/lib \
+	$(QT5_BASE)/lib/libqtmain.a \
+	$(addsuffix .a,$(addprefix $(QT5_BASE)/lib/libQt5,$(QT5_MODULES)))
+
+APP_DEP_LIBS = $(OBJPATH)winres.o
+APP_DEPS = 
+
+# Qt tools
+QT_RCC = $(QT5_BASE)/bin/rcc
+
+QT_MOC = $(QT5_BASE)/bin/moc
+QT_MOC_FLAGS = --include moc_predefs.h
+QT_MOC_RULES = moc_predefs.h
+
+QT_UIC = $(QT5_BASE)/bin/uic
+QT_UIC_FLAGS =
+
+CLEAN_TARGETS += moc_predefs.h src/winres.rc
+
+include Makefile.gen
--- a/Makefile.cross-mingw-win32	Thu Dec 05 03:16:56 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-###
-### For win32 version cross-compilation with MinGW suite @ Linux
-###
-USE_QTHTTP ?= yes
-
-ifeq ($(MINGW),64)
-BINTOOL_PREFIX ?= x86_64-w64-mingw32-
-MINGW_SYS_PATH ?= /usr/x86_64-w64-mingw32
-MINGW_LOCAL_PATH ?= /usr/local/x86_64-w64-mingw32
-OBJPATH ?= ./obj/win64/
-else
-BINTOOL_PREFIX ?= i686-w64-mingw32-
-MINGW_SYS_PATH ?= /usr/i686-w64-mingw32
-MINGW_LOCAL_PATH ?= /usr/local/i686-w64-mingw32
-OBJPATH ?= ./obj/win32/
-endif
-
-PREFIX =
-EXEEXT = .exe
-
-# Miscellaneous
-QT5_MODULES = Core Gui Widgets Sql PrintSupport
-QT5_PREFIX ?= /misc/packages/qt5-src
-QT5_BASE ?= $(QT5_PREFIX)/qtbase
-
-# Compiler flags and linker flags
-DEFINES = -DUNICODE -DQT_NEEDS_QMAIN
-ifeq ($(USE_QTHTTP),yes)
-QT5_MODULES += Network
-DEFINES += -DUSE_QTHTTP
-endif
-INCPATH = -I. \
-	-I$(QT5_BASE)/include \
-	$(addprefix -I$(QT5_BASE)/include/Qt,$(QT5_MODULES)) \
-	-I$(QT5_MULTIMEDIA)/include \
-	-I$(QT5_BASE)/mkspecs/win32-g++
-
-CFLAGS += -pipe -fno-keep-inline-dllexport
-CXXFLAGS += -pipe -fno-keep-inline-dllexport -frtti -fexceptions -mthreads
-LDFLAGS += -Wl,-s -Wl,-subsystem,windows -mthreads
-
-APP_LIBS = -lglu32 -lopengl32 -lgdi32 -luser32 -lmingw32 \
-	-L$(QT5_BASE)/lib \
-	$(QT5_BASE)/lib/libqtmain.a \
-	$(addsuffix .a,$(addprefix $(QT5_BASE)/lib/libQt5,$(QT5_MODULES)))
-
-APP_DEP_LIBS = $(OBJPATH)winres.o
-APP_DEPS = 
-
-# Qt tools
-QT_RCC = $(QT5_BASE)/bin/rcc
-
-QT_MOC = $(QT5_BASE)/bin/moc
-QT_MOC_FLAGS = --include moc_predefs.h
-QT_MOC_RULES = moc_predefs.h
-
-QT_UIC = $(QT5_BASE)/bin/uic
-QT_UIC_FLAGS =
-
-CLEAN_TARGETS += moc_predefs.h src/winres.rc
-
-include Makefile.gen
--- a/build-win32.sh	Thu Dec 05 03:16:56 2019 +0200
+++ b/build-win32.sh	Thu Dec 05 03:17:24 2019 +0200
@@ -58,7 +58,7 @@
 
 
 ### Create cross-building makefiles
-make -f Makefile.cross-mingw-win32 QT5_PREFIX="$QT5_PREFIX" BINPATH="$BUILDPATH"
+make -f Makefile.cross-mingw QT5_PREFIX="$QT5_PREFIX" BINPATH="$BUILDPATH"
 
 ### Install to targets
 if test -d "$INSTALL_USB" && mount|grep -q "$INSTALL_USB"; then