Skip to content

Commit a4150a3

Browse files
Giacomo GroppiGiacomo Groppi
Giacomo Groppi
authored and
Giacomo Groppi
committedSep 6, 2022
fix: windows build
1 parent 69e05a4 commit a4150a3

File tree

5 files changed

+105
-101
lines changed

5 files changed

+105
-101
lines changed
 

‎windows/build_libzip.sh

+61-61
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
1-
old=$(pwd)
2-
cd ..
3-
4-
echo "PATH: " $(pwd)
5-
6-
cd 3rdparty
7-
PREFIX_LIB=$(pwd)
8-
9-
cd zlib-ng
10-
11-
rm -r build
12-
rm -r install
13-
14-
mkdir build
15-
mkdir install
16-
cd build
17-
18-
cmake .. \
19-
-DCMAKE_INSTALL_PREFIX=$PREFIX_LIB/zlib-ng/install \
20-
-DBIN_INSTALL_DIR=$PREFIX_LIB/zlib-ng/install/bin \
21-
-DLIB_INSTALL_DIR=$PREFIX_LIB/zlib-ng/install/lib \
22-
-DINC_INSTALL_DIR=$PREFIX_LIB/zlib-ng/install/include \
23-
-DPKGCONFIG_INSTALL_DIR=$PREFIX_LIB/zlib-ng/install/lib/pkgconfig \
24-
-DMAN_INSTALL_DIR=$PREFIX_LIB/zlib-ng/install/share/man \
25-
-DCMAKE_BUILD_TYPE=Release \
26-
-DBUILD_SHARED_LIBS=OFF \
27-
-DZLIB_COMPAT=ON \
28-
-DZLIB_ENABLE_TESTS=OFF
29-
30-
cmake --build . --config Release --target install
31-
32-
echo "Prefix lib: " $PREFIX_LIB
33-
34-
cd $PREFIX_LIB/libzip
35-
36-
rm -r build
37-
rm -r install
38-
39-
mkdir build
40-
mkdir install
41-
42-
cd build
43-
cmake .. \
44-
-DCMAKE_INSTALL_PREFIX=$PREFIX_LIB/libzip/install \
45-
-DCMAKE_BUILD_TYPE=Release \
46-
-DENABLE_BZIP2=OFF \
47-
-DENABLE_LZMA=OFF \
48-
-DENABLE_COMMONCRYPTO=OFF \
49-
-DENABLE_GNUTLS=OFF \
50-
-DENABLE_MBEDTLS=OFF \
51-
-DENABLE_OPENSSL=OFF \
52-
-DENABLE_WINDOWS_CRYPTO=OFF \
53-
-DBUILD_DOC=OFF \
54-
-DBUILD_EXAMPLES=OFF \
55-
-DBUILD_REGRESS=OFF \
56-
-DBUILD_SHARED_LIBS=OFF \
57-
-DBUILD_TOOLS=OFF \
58-
-DZLIB_INCLUDE_DIR=$PREFIX_LIB/zlib-ng/install/include \
59-
-DZLIB_LIBRARY_DEBUG=$PREFIX_LIB/zlib-ng/install/lib/libzlib.a \
60-
-DZLIB_LIBRARY_RELEASE=$PREFIX_LIB/zlib-ng/install/lib/libzlib.a
61-
1+
old=$(pwd)
2+
cd ..
3+
4+
echo "PATH: " $(pwd)
5+
6+
cd 3rdparty
7+
PREFIX_LIB=$(pwd)
8+
9+
cd zlib-ng
10+
11+
rm -rf build
12+
rm -rf install
13+
14+
mkdir build
15+
mkdir install
16+
cd build
17+
18+
cmake .. \
19+
-DCMAKE_INSTALL_PREFIX=$PREFIX_LIB/zlib-ng/install \
20+
-DBIN_INSTALL_DIR=$PREFIX_LIB/zlib-ng/install/bin \
21+
-DLIB_INSTALL_DIR=$PREFIX_LIB/zlib-ng/install/lib \
22+
-DINC_INSTALL_DIR=$PREFIX_LIB/zlib-ng/install/include \
23+
-DPKGCONFIG_INSTALL_DIR=$PREFIX_LIB/zlib-ng/install/lib/pkgconfig \
24+
-DMAN_INSTALL_DIR=$PREFIX_LIB/zlib-ng/install/share/man \
25+
-DCMAKE_BUILD_TYPE=Release \
26+
-DBUILD_SHARED_LIBS=OFF \
27+
-DZLIB_COMPAT=ON \
28+
-DZLIB_ENABLE_TESTS=OFF
29+
30+
cmake --build . --config Release --target install
31+
32+
echo "Prefix lib: " $PREFIX_LIB
33+
34+
cd $PREFIX_LIB/libzip
35+
36+
rm -r build
37+
rm -r install
38+
39+
mkdir build
40+
mkdir install
41+
42+
cd build
43+
cmake .. \
44+
-DCMAKE_INSTALL_PREFIX=$PREFIX_LIB/libzip/install \
45+
-DCMAKE_BUILD_TYPE=Release \
46+
-DENABLE_BZIP2=OFF \
47+
-DENABLE_LZMA=OFF \
48+
-DENABLE_COMMONCRYPTO=OFF \
49+
-DENABLE_GNUTLS=OFF \
50+
-DENABLE_MBEDTLS=OFF \
51+
-DENABLE_OPENSSL=OFF \
52+
-DENABLE_WINDOWS_CRYPTO=OFF \
53+
-DBUILD_DOC=OFF \
54+
-DBUILD_EXAMPLES=OFF \
55+
-DBUILD_REGRESS=OFF \
56+
-DBUILD_SHARED_LIBS=OFF \
57+
-DBUILD_TOOLS=OFF \
58+
-DZLIB_INCLUDE_DIR=$PREFIX_LIB/zlib-ng/install/include \
59+
-DZLIB_LIBRARY_DEBUG=$PREFIX_LIB/zlib-ng/install/lib/libzlib.a \
60+
-DZLIB_LIBRARY_RELEASE=$PREFIX_LIB/zlib-ng/install/lib/libzlib.a
61+
6262
cmake --build . --config Release --target install

‎windows/build_poppler.sh

+24-20
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
old=$(pwd)
2-
cd ..
3-
cd 3rdparty
4-
5-
PREFIX_LIB=$(pwd)
6-
7-
cd poppler
8-
mkdir build
9-
mkdir install
10-
11-
cd build
12-
cmake .. \
13-
-DCMAKE_INSTALL_PREFIX=$PREFIX_LIB/poppler \
14-
-DENABLE_CPP=OFF \
15-
-DENABLE_GLIB=OFF \
16-
-DENABLE_QT5=OFF \
17-
-DENABLE_UTILS=OFF
18-
19-
20-
ninja
1+
old=$(pwd)
2+
cd ..
3+
cd 3rdparty
4+
5+
PREFIX_LIB=$(pwd)
6+
7+
cd poppler
8+
9+
rm -rf build
10+
rm -rf install
11+
12+
mkdir build
13+
mkdir install
14+
15+
cd build
16+
cmake .. \
17+
-DCMAKE_INSTALL_PREFIX=$PREFIX_LIB/poppler \
18+
-DENABLE_CPP=OFF \
19+
-DENABLE_GLIB=OFF \
20+
-DENABLE_QT5=OFF \
21+
-DENABLE_UTILS=OFF
22+
23+
24+
ninja
2125
ninja install

‎windows/dipendenze.sh

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
pacman --noconfirm -Sy
2-
3-
pacman --noconfirm -S git \
4-
mingw-w64-x86_64-toolchain \
5-
mingw-w64-x86_64-cmake \
6-
patch \
7-
mingw-w64-x86_64-cppunit \
8-
make \
9-
mingw-w64-x86_64-nsis \
10-
mingw-w64-x86_64-qt6-base \
11-
mingw-w64-x86_64-poppler-qt6 \
12-
mingw-w64-x86_64-ninja \
13-
mingw-w64-x86_64-qt6-multimedia \
14-
mingw-w64-x86_64-boost \
15-
mingw-w64-x86_64-openssl
1+
pacman --noconfirm -Sy
2+
3+
pacman --noconfirm -S git \
4+
mingw-w64-x86_64-toolchain \
5+
mingw-w64-x86_64-cmake \
6+
patch \
7+
mingw-w64-x86_64-cppunit \
8+
make \
9+
mingw-w64-x86_64-nsis \
10+
mingw-w64-x86_64-qt6-base \
11+
mingw-w64-x86_64-poppler-qt6 \
12+
mingw-w64-x86_64-ninja \
13+
mingw-w64-x86_64-qt6-multimedia \
14+
mingw-w64-x86_64-boost \
15+
mingw-w64-x86_64-openssl

‎windows/package.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
2-
"C:\Program Files (x86)\Inno Setup 6\ISCC.exe" .\package.iss
1+
2+
"C:\Program Files (x86)\Inno Setup 6\ISCC.exe" .\package.iss

‎windows/windows.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
C:\msys64\usr\bin\bash -lc "./compile.sh"
2-
C:\msys64\usr\bin\bash -lc "echo $pwd"
3-
start .\package.bat
1+
C:\msys64\usr\bin\bash -lc "./compile.sh"
2+
C:\msys64\usr\bin\bash -lc "echo $pwd"
3+
start .\package.bat

0 commit comments

Comments
 (0)
Please sign in to comment.