Make default linux build configuration easier for packages

ahrm · Apr 10, 2022 · a110d88 · a110d88
1 parent f6236fc
commit a110d88
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/build_and_release.sh b/build_and_release.sh
@@ -14,9 +14,9 @@ make USE_SYSTEM_HARFBUZZ=yes
 cd ..
 
 if [[ $1 == portable ]]; then
- qmake pdf_viewer_build_config.pro
+ qmake "CONFIG+=linux_app_image" pdf_viewer_build_config.pro
 else
- qmake "CONFIG+=non_portable" pdf_viewer_build_config.pro
+ qmake "CONFIG+=linux_app_image non_portable" pdf_viewer_build_config.pro
 fi
 
 rm -r sioyek-release 2> /dev/null
@@ -52,4 +52,4 @@ if [[ $1 == portable ]]; then
 else
  mv Sioyek-* Sioyek-x86_64.AppImage
  zip sioyek-release-linux.zip Sioyek-x86_64.AppImage
-fi
+fi
diff --git a/build_linux.sh b/build_linux.sh
@@ -1,7 +1,7 @@
 cd mupdf
 make USE_SYSTEM_HARFBUZZ=yes
 cd ..
-qmake pdf_viewer_build_config.pro
+qmake "CONFIG+=linux_app_image" pdf_viewer_build_config.pro
 make
 
 rm -r build 2> /dev/null

diff --git a/pdf_viewer_build_config.pro b/pdf_viewer_build_config.pro
@@ -10,7 +10,6 @@ QT += core sql opengl gui widgets quickwidgets 3dcore 3danimation 3dextras 3dinp
 CONFIG += c++17
 DEFINES += QT_3DCORE_LIB QT_3DANIMATION_LIB QT_3DEXTRAS_LIB QT_3DINPUT_LIB QT_3DLOGIC_LIB QT_3DRENDER_LIB QT_OPENGL_LIB QT_OPENGLEXTENSIONS_LIB QT_QUICKWIDGETS_LIB QT_SQL_LIB QT_WIDGETS_LIB
 
-
 CONFIG(non_portable){
  DEFINES += NON_PORTABLE
 }
@@ -73,7 +72,15 @@ win32{
 unix:!mac {
 
  QMAKE_CXXFLAGS += -std=c++17
- LIBS += -ldl -Lmupdf/build/release -lmupdf -lmupdf-third -lmupdf-threads -lharfbuzz -lz
+
+ CONFIG(linux_app_image){
+ LIBS += -ldl -Lmupdf/build/release -lmupdf -lmupdf-third -lmupdf-threads -lharfbuzz -lz
+ } else {
+ DEFINES += NON_PORTABLE
+ DEFINES += LINUX_STANDARD_PATHS
+ LIBS += -ldl -lmupdf -lharfbuzz -lfreetype -ljbig2dec -ljpeg -lmujs -lopenjp2 -lz
+ }
+
  isEmpty(PREFIX){
  PREFIX = /usr
  }