Browse Source

cleaned up cross build for windows

tags/1.3
Sven Oliver Moll 1 year ago
parent
commit
53afcf860a
3 changed files with 10 additions and 13 deletions
  1. 5
    5
      Makefile
  2. 4
    7
      packaging/windows/build-cross.sh
  3. 1
    1
      packaging/windows/fridgegrid-cross.nsi

+ 5
- 5
Makefile View File

@@ -4,7 +4,7 @@ BUILDDIR = build

all: release

.PHONY: debug release
.PHONY: debug release exe windows dmg macosx

release: $(BUILDDIR)-release/Makefile
+make -C $(BUILDDIR)-release all
@@ -24,9 +24,9 @@ $(BUILDDIR)-release $(BUILDDIR)-debug:
distclean clean:
rm -rf $(BUILDDIR)-release $(BUILDDIR)-debug

exe:
(cd packaging/windows ; ./build-cross.sh)
exe windows:
packaging/windows/build-cross.sh

dmg:
(cd packaging/macosx ; ./build-app.sh)
dmg macosx:
packaging/macosx/build-app.sh


+ 4
- 7
packaging/windows/build-cross.sh View File

@@ -1,23 +1,20 @@
#!/bin/sh

MINGW=/opt/mxe
PLATFORM=i686-pc-mingw32
PLATFORM=i686-w64-mingw32.static

PACKAGINGDIR=../../build/packaging

set -e
set -ex

export PATH=${PATH}:${MINGW}/usr/bin

cd "$(dirname $0)"
(cd ../..
#rm -rf build
#${PLATFORM}-qmake -r CONFIG+=debug_and_release
MAKEFLAGS=-j4 make release QMAKE=${PLATFORM}-qmake)
MAKEFLAGS=-j4 make -C ../.. release QMAKE=${PLATFORM}-qmake-qt5

mkdir -p ${PACKAGINGDIR}

for i in ../../build/release/bin/* ../../build/release/lib/*.dll; do
for i in ../../build-release/bin/* ../../build-release/lib/*.dll; do
if [ -f "${i}" ]; then
INSTALLFILES="${INSTALLFILES} ${i}"
fi

+ 1
- 1
packaging/windows/fridgegrid-cross.nsi View File

@@ -27,7 +27,7 @@ RequestExecutionLevel admin
SetCompressor /SOLID lzma
; License to use
LicenseData ..\..\LICENSE.GPL
LicenseData ..\..\LICENSE.TXT
;--------------------------------

Loading…
Cancel
Save