1st qt6 port

2022-05-15 23:02:47 -07:00
parent c8362269f4
commit 638450c8d4
14 changed files with 52 additions and 38 deletions
@@ -176,6 +176,7 @@ unix:!mac {

 mac {
    CONFIG += staticlib
+    QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
    # This is necessary to avoid an undefined impl__xmlFree.
    # See comment in libxml/xmlexports.h
    DEFINES += LIBXML_STATIC
@@ -3,11 +3,18 @@ QT       -= core gui
 TARGET = libxapian
 TEMPLATE = lib

-DEFINES += __WIN32__
-DEFINES += UNICODE
 DEFINES += HAVE_CONFIG_H

-XAPIANDIR = ../../../../recolldeps/msvc/xapian-core/
+windows {
+    XAPIANDIR = ../../../../recolldeps/msvc/xapian-core/
+    DEFINES += __WIN32__
+    DEFINES += UNICODE
+}
+mac {
+    XAPIANDIR = ../../../../xapian-core-1.4.18/
+    CONFIG += staticlib
+    QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
+}

 SOURCES += \
 $$XAPIANDIR/api/compactor.cc \
@@ -58,6 +58,7 @@ windows {
 }

 mac {
+  QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
  QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter
  SOURCES += \
    ../../utils/closefrom.cpp \
@@ -66,7 +67,7 @@ mac {
    ../../utils/rclionice.cpp

  LIBS += \
-     ../build-librecoll-Desktop_Qt_5_14_2_clang_64bit-Release/liblibrecoll.a \
-     ../../../../xapian-core-1.4.18/.libs/libxapian.a \
+     ../build-librecoll-Qt_6_2_4_for_macOS-Release/liblibrecoll.a \
+     ../build-libxapian-Qt_6_2_4_for_macOS-Release/liblibxapian.a \
     -lxslt -lxml2 -liconv -lz
 }
@@ -45,6 +45,7 @@ windows {
 }

 mac {
+  QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
  QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter
  SOURCES += \
    ../../utils/closefrom.cpp \
@@ -52,7 +53,7 @@ mac {
    ../../utils/netcon.cpp \
    ../../utils/rclionice.cpp
  LIBS += \
-     ../build-librecoll-Desktop_Qt_5_14_2_clang_64bit-Release/liblibrecoll.a \
-     ../../../../xapian-core-1.4.18/.libs/libxapian.a \
+     ../build-librecoll-Qt_6_2_4_for_macOS-Release/liblibrecoll.a \
+     ../build-libxapian-Qt_6_2_4_for_macOS-Release/liblibxapian.a \
     -lxslt -lxml2 -liconv -lz
 }