updated build system

cmake/libraries/sqlite.cmake

@@ -2,7 +2,7 @@ if(PROJECT_ENABLE_SQLITE)
   if(PROJECT_BUILD)
     add_definitions(-DPROJECT_ENABLE_SQLITE)
 
-    if(PROJECT_BUILD_SHARED_LIBS)
+    if(PROJECT_BUILD_SHARED_LIBS AND NOT PROJECT_IS_MINGW)
       find_package(SQLite3 REQUIRED ${SQLITE_VERSION2})
 
       include_directories(${SQLite3_INCLUDE_DIRS})
@@ -17,30 +17,21 @@ if(PROJECT_ENABLE_SQLITE)
         ${SQLITE_SYSTEM_ROOT}/sqlite3.c
       )
     endif()
-  elseif(PROJECT_BUILD_SHARED_LIBS)
+  elseif(PROJECT_BUILD_SHARED_LIBS AND NOT PROJECT_IS_MINGW)
-    if(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
+    ExternalProject_Add(sqlite_project
-      if(PROJECT_IS_MINGW)
+      PREFIX external
-        set(SQLITE_TYPE mingw64)
+      URL ${PROJECT_3RD_PARTY_DIR}/sqlite-${SQLITE_VERSION2}.tar.gz
-      else()
+      URL_HASH SHA256=ae85b5545f6171694f4d7f915e8e87a936fcb1a56409e5fb3da89d52e3c224cc
-        set(SQLITE_TYPE linux)
+      BUILD_IN_SOURCE 1
-      endif()
+      LIST_SEPARATOR |
+      CONFIGURE_COMMAND ${PROJECT_3RD_PARTY_DIR}/sqlite_configure.sh 
+        ${PROJECT_MARCH}
+        ${PROJECT_EXTERNAL_BUILD_ROOT}
+      BUILD_COMMAND make -j1
+      INSTALL_COMMAND make install
+    )
 
-      ExternalProject_Add(sqlite_project
+    list(APPEND PROJECT_DEPENDENCIES sqlite_project)
-        PREFIX external
-        URL ${PROJECT_3RD_PARTY_DIR}/sqlite-${SQLITE_VERSION2}.tar.gz
-        URL_HASH SHA256=ae85b5545f6171694f4d7f915e8e87a936fcb1a56409e5fb3da89d52e3c224cc
-        BUILD_IN_SOURCE 1
-        LIST_SEPARATOR |
-        CONFIGURE_COMMAND ${PROJECT_3RD_PARTY_DIR}/sqlite_configure.sh 
-          ${SQLITE_TYPE}
-          ${PROJECT_MARCH}
-          ${PROJECT_EXTERNAL_BUILD_ROOT}
-        BUILD_COMMAND make -j1
-        INSTALL_COMMAND make install
-      )
-
-      list(APPEND PROJECT_DEPENDENCIES sqlite_project)
-    endif()
   else()
     ExternalProject_Add(sqlite_project
       PREFIX external

docker/x86_64/mingw64

@@ -942,23 +942,6 @@ RUN if [ -f "/3rd_party/sdl-${MY_SDL_VERSION}.tar.gz" ]; then \
       && rm -r SDL-release-${MY_SDL_VERSION} \
    ; fi
 
-ARG SQLITE_VERSION2
-ENV MY_SQLITE_VERSION2=${SQLITE_VERSION2}
-RUN if [ -f "/3rd_party/sqlite-${MY_SQLITE_VERSION2}.tar.gz" ]; then \
-      tar xvzf /3rd_party/sqlite-${MY_SQLITE_VERSION2}.tar.gz \
-      && cd sqlite-version-${MY_SQLITE_VERSION2} \
-      && CFLAGS="-O3 -m64 -mtune=generic" ./configure \
-        --disable-tcl \
-        --enable-shared \
-        --enable-static \
-        --host=${MY_MINGW_PREFIX} \
-        --prefix=${MY_MINGW_DIR} \
-      && make -j${MY_NUM_JOBS} \
-      && make install \
-      && cd ${MY_WORKDIR} \
-      && rm -r cd sqlite-version-${MY_SQLITE_VERSION2}  \
-   ; fi
-
 RUN (mv ${MY_MINGW_DIR}/lib/*.dll ${MY_MINGW_DIR}/bin || echo "no dll's found") \
     && chmod 0777 -R ${MY_MINGW_DIR} \
     && rm -rf /3rd_party

support/3rd_party/sqlite_configure.sh

@@ -1,12 +1,7 @@
 #!/bin/bash
 
-if [ "$1" == "mingw64" ]; then
+CFLAGS="-O3 -march=$1 -mtune=generic" ./configure \
-  HOST_CFG=--host=x86_64-w64-mingw32
-fi
-
-CFLAGS="-O3 -march=$2 -mtune=generic" ./configure \
   --disable-tcl \
   --enable-shared=yes \
   --enable-static=yes \
-  --prefix="$3" \
+  --prefix="$2"
-  ${HOST_CFG}