shared lib doesn't work well on ARM64 Linux, use static instead

Ritchie333 · Oct 7, 2024 · c05a877 · c05a877
1 parent f4b6e2b
commit c05a877
Show file tree

Hide file tree

Showing 2 changed files with 163 additions and 163 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,162 +1,162 @@
-cmake_minimum_required(VERSION 3.30)
-project(warp-sabre LANGUAGES C CXX)
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
-set(CMAKE_BUILD_TYPE Debug)
-
-find_package(ImageMagick REQUIRED COMPONENTS MagickWand)
-include_directories(${ImageMagick_INCLUDE_DIRS})
-add_compile_options(${ImageMagick_COMPILE_OPTIONS})
-find_package(wxWidgets REQUIRED COMPONENTS core base)
-add_compile_options(-DUSE_MT_GENTILES)
-add_compile_options(-Wall)
-
-find_package(Boost REQUIRED COMPONENTS system thread)
-find_package(LibXml2 REQUIRED)
-
-include_directories(${LIBXML2_INCLUDE_DIR})
-include(${wxWidgets_USE_FILE})
-
-add_library(morph STATIC
-    src/libmorph/my_malloc.c
-    src/libmorph/warp.c
-    src/libmorph/mesh.c
-    src/libmorph/spline.c
-    src/libmorph/tga.c
-    src/libmorph/RgbaImage.c
-    src/libmorph/spl-array.c
-    src/libmorph/warp2.c
-    src/libmorph/relax.c
-    src/libmorph/resample.c
-)
-
-target_compile_options(morph PRIVATE -DREAL=double)
-
-add_library(newmat STATIC
-    src/newmat-10/newmat1.cpp
-    src/newmat-10/newmat2.cpp
-    src/newmat-10/newmat3.cpp
-    src/newmat-10/newmat4.cpp
-    src/newmat-10/newmat5.cpp
-    src/newmat-10/newmat6.cpp
-    src/newmat-10/newmat7.cpp
-    src/newmat-10/newmat8.cpp
-    src/newmat-10/newmatex.cpp
-    src/newmat-10/bandmat.cpp
-    src/newmat-10/submat.cpp
-    src/newmat-10/myexcept.cpp
-    src/newmat-10/cholesky.cpp
-    src/newmat-10/evalue.cpp
-    src/newmat-10/fft.cpp
-    src/newmat-10/hholder.cpp
-    src/newmat-10/jacobi.cpp
-    src/newmat-10/newfft.cpp
-    src/newmat-10/sort.cpp
-    src/newmat-10/svd.cpp
-    src/newmat-10/newmatrm.cpp
-    src/newmat-10/newmat9.cpp
-)
-
-add_library(warp-conversion STATIC
-    src/ganzc/LatLong-OSGBconversion.cpp
-    src/gbos1936/Gbos1936.cpp
-)
-
-add_library(warp SHARED
-    src/CalibrationFile.cpp
-    src/CopyPixels.cpp
-    src/GetBounds.cpp
-    src/ImageWarpByFunc.cpp
-    src/ImgMagick.cpp
-    src/Log.cpp
-    src/ReadDelimitedFile.cpp
-    src/ProgramOptions.cpp
-    src/ReadKmlFile.cpp
-    src/SlippyMapTile.cpp
-    src/SourceKml.cpp
-    src/StringUtils.cpp
-    src/Tile.cpp
-    src/TileJob.cpp
-    src/TransformPoly.cpp
-    src/Warp.cpp
-    src/WriteKml.cpp
-)
-
-add_executable(warp-sabre
-    src/WarpOs.cpp
-)
-
-add_executable(gentiles
-    src/GenTiles.cpp
-)
-
-add_executable(cleartiles
-    src/ClearTiles.cpp
-)
-
-add_executable(testcas
-    src/TestCas.cpp
-)
-
-add_executable(warp-sabre-gui
-    src/gui/BaseDlg.cpp
-    src/gui/WarpDlg.cpp
-    src/gui/WarpGui.cpp
-    src/gui/WarpProgressDlg.cpp
-)
-
-add_executable(gentiles-gui
-    src/gui/BaseDlg.cpp
-    src/gui/GentilesDlg.cpp
-    src/gui/GentilesGui.cpp
-)
-
-target_include_directories(warp PUBLIC
-    ${PROJECT_SOURCE_DIR}/libmorph
-    ${PROJECT_SOURCE_DIR}/newmat-10
-)
-
-target_link_libraries( warp
-    PRIVATE ImageMagick::MagickWand
-    PRIVATE xml2
-    PRIVATE Boost::thread
-    PRIVATE Boost::system
-    PRIVATE morph
-    PRIVATE newmat
-    PRIVATE warp-conversion
-)
-
-target_link_libraries(warp-sabre
-    PRIVATE warp
-)
-
-target_link_libraries(warp-sabre-gui
-    PRIVATE warp
-    PRIVATE ${wxWidgets_LIBRARIES}
-)
-
-target_include_directories(gentiles PUBLIC
-    ${PROJECT_SOURCE_DIR}/libmorph
-)
-
-target_link_libraries(gentiles
-    PRIVATE warp
-)
-
-target_link_libraries(gentiles-gui
-    PRIVATE warp
-    PRIVATE ${wxWidgets_LIBRARIES}
-)
-
-target_include_directories(cleartiles PUBLIC
-    ${PROJECT_SOURCE_DIR}/libmorph
-)
-
-target_link_libraries(cleartiles
-    PRIVATE warp
-)
-
-target_link_libraries(testcas
-    PRIVATE warp-conversion
-)
+cmake_minimum_required(VERSION 3.30)
+project(warp-sabre LANGUAGES C CXX)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+set(CMAKE_BUILD_TYPE Debug)
+
+find_package(ImageMagick REQUIRED COMPONENTS MagickWand)
+include_directories(${ImageMagick_INCLUDE_DIRS})
+add_compile_options(${ImageMagick_COMPILE_OPTIONS})
+find_package(wxWidgets REQUIRED COMPONENTS core base)
+add_compile_options(-DUSE_MT_GENTILES)
+add_compile_options(-Wall)
+
+find_package(Boost REQUIRED COMPONENTS system thread)
+find_package(LibXml2 REQUIRED)
+
+include_directories(${LIBXML2_INCLUDE_DIR})
+include(${wxWidgets_USE_FILE})
+
+add_library(morph STATIC
+    src/libmorph/my_malloc.c
+    src/libmorph/warp.c
+    src/libmorph/mesh.c
+    src/libmorph/spline.c
+    src/libmorph/tga.c
+    src/libmorph/RgbaImage.c
+    src/libmorph/spl-array.c
+    src/libmorph/warp2.c
+    src/libmorph/relax.c
+    src/libmorph/resample.c
+)
+
+target_compile_options(morph PRIVATE -DREAL=double)
+
+add_library(newmat STATIC
+    src/newmat-10/newmat1.cpp
+    src/newmat-10/newmat2.cpp
+    src/newmat-10/newmat3.cpp
+    src/newmat-10/newmat4.cpp
+    src/newmat-10/newmat5.cpp
+    src/newmat-10/newmat6.cpp
+    src/newmat-10/newmat7.cpp
+    src/newmat-10/newmat8.cpp
+    src/newmat-10/newmatex.cpp
+    src/newmat-10/bandmat.cpp
+    src/newmat-10/submat.cpp
+    src/newmat-10/myexcept.cpp
+    src/newmat-10/cholesky.cpp
+    src/newmat-10/evalue.cpp
+    src/newmat-10/fft.cpp
+    src/newmat-10/hholder.cpp
+    src/newmat-10/jacobi.cpp
+    src/newmat-10/newfft.cpp
+    src/newmat-10/sort.cpp
+    src/newmat-10/svd.cpp
+    src/newmat-10/newmatrm.cpp
+    src/newmat-10/newmat9.cpp
+)
+
+add_library(warp-conversion STATIC
+    src/ganzc/LatLong-OSGBconversion.cpp
+    src/gbos1936/Gbos1936.cpp
+)
+
+add_library(warp STATIC
+    src/CalibrationFile.cpp
+    src/CopyPixels.cpp
+    src/GetBounds.cpp
+    src/ImageWarpByFunc.cpp
+    src/ImgMagick.cpp
+    src/Log.cpp
+    src/ReadDelimitedFile.cpp
+    src/ProgramOptions.cpp
+    src/ReadKmlFile.cpp
+    src/SlippyMapTile.cpp
+    src/SourceKml.cpp
+    src/StringUtils.cpp
+    src/Tile.cpp
+    src/TileJob.cpp
+    src/TransformPoly.cpp
+    src/Warp.cpp
+    src/WriteKml.cpp
+)
+
+add_executable(warp-sabre
+    src/WarpOs.cpp
+)
+
+add_executable(gentiles
+    src/GenTiles.cpp
+)
+
+add_executable(cleartiles
+    src/ClearTiles.cpp
+)
+
+add_executable(testcas
+    src/TestCas.cpp
+)
+
+add_executable(warp-sabre-gui
+    src/gui/BaseDlg.cpp
+    src/gui/WarpDlg.cpp
+    src/gui/WarpGui.cpp
+    src/gui/WarpProgressDlg.cpp
+)
+
+add_executable(gentiles-gui
+    src/gui/BaseDlg.cpp
+    src/gui/GentilesDlg.cpp
+    src/gui/GentilesGui.cpp
+)
+
+target_include_directories(warp PUBLIC
+    ${PROJECT_SOURCE_DIR}/libmorph
+    ${PROJECT_SOURCE_DIR}/newmat-10
+)
+
+target_link_libraries( warp
+    PRIVATE ImageMagick::MagickWand
+    PRIVATE xml2
+    PRIVATE Boost::thread
+    PRIVATE Boost::system
+    PRIVATE morph
+    PRIVATE newmat
+    PRIVATE warp-conversion
+)
+
+target_link_libraries(warp-sabre
+    PRIVATE warp
+)
+
+target_link_libraries(warp-sabre-gui
+    PRIVATE warp
+    PRIVATE ${wxWidgets_LIBRARIES}
+)
+
+target_include_directories(gentiles PUBLIC
+    ${PROJECT_SOURCE_DIR}/libmorph
+)
+
+target_link_libraries(gentiles
+    PRIVATE warp
+)
+
+target_link_libraries(gentiles-gui
+    PRIVATE warp
+    PRIVATE ${wxWidgets_LIBRARIES}
+)
+
+target_include_directories(cleartiles PUBLIC
+    ${PROJECT_SOURCE_DIR}/libmorph
+)
+
+target_link_libraries(cleartiles
+    PRIVATE warp
+)
+
+target_link_libraries(testcas
+    PRIVATE warp-conversion
+)
diff --git a/build_mingw.sh b/build_mingw.sh
@@ -3,4 +3,4 @@
 mkdir -p build
 cd build
 cmake -DLIBXML2_INCLUDE_DIR=$MINGW_PREFIX/include/libxml2 -DImageMagick_COMPILE_OPTIONS=`MagickWand-config --cppflags | sed 's/ /;/g'` -DImageMagick_LIBRARIES=`MagickWand-config --libs | sed 's/ /;/g'` ..
-make
+cmake --build .