Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh

.appveyor.yml

@@ -1,29 +0,0 @@
-os:
-  - Visual Studio 2017
-
-configuration:
-  - Debug
-
-platform:
-  - Win64
-
-environment:
-  MSVC_DEFAULT_OPTIONS: ON
-  MYSQL_PWD: "Password12!"
-
-services:
-  - mysql
-
-before_build:
-  - set PATH="C:\\Program Files\\MySQL\\MySQL Server 5.7\\bin";%PATH%
-  - cd c:\projects\sapphire
-  - git submodule update --init
-  - mkdir build
-  - cd build
-  - cmake .. -G "Visual Studio 15 2017 Win64" 
-  - cmake --build . --target ALL_BUILD --config Release
-
-build_script:
-  - cd bin  
-  - copy "C:\Program Files\MySQL\MySQL Server 5.7\lib\libmysql.dll" libmysql.dll
-  - sh sql_import.sh

.github/workflows/build.yml

@@ -41,11 +41,9 @@ jobs:
         submodules: recursive
     - name: Enable Developer Command Prompt
       uses: ilammy/msvc-dev-cmd@v1.10.0
-    - name: install deps & remove default garbage
+    - name: install deps
       run: |
-        $env:PATH
         choco install --no-progress mariadb ninja
-        choco list --local-only
     - name: cmake init
       run: |
         mkdir build

.travis.yml

@@ -1,42 +0,0 @@
----
-language: c++
-
-sudo: enabled
-
-git:
-  depth: 5
-
-matrix:
-  include:
-    - os: linux
-      addons:
-        apt:
-          sources:
-          - ubuntu-toolchain-r-test
-          packages:
-          - g++-7
-      env:
-      - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
-
-# Setup cache
-cache:
-  directories:
-    - build
-    - .mtime_cache
-
-# Setup build matrix and dependencies
-before_install:
-  - eval "${MATRIX_EVAL}"
-  - gem install mtime_cache --no-document
-  - sudo apt-get update
-  - sudo apt-get install -y libmysqlclient-dev
-
-# Build steps
-script:
-  - $CXX --version
-  - mtime_cache src/**/*.{%{cpp}} -c .mtime_cache/cache.json
-  - mkdir -p build
-  - cd build
-  - cmake .. && make -j 3
-  - cd bin
-  - bash sql_import.sh

CMakeLists.txt

@@ -41,7 +41,7 @@ find_package( MySQL )
 add_subdirectory( "deps/zlib" )
 add_subdirectory( "deps/MySQL" )
 add_subdirectory( "deps/datReader" )
-add_subdirectory( "deps/datReaderPs3" )
+#add_subdirectory( "deps/datReaderPs3" )
 add_subdirectory( "deps/mysqlConnector" )
 add_subdirectory( "deps/recastnavigation" )
 

CMakeSettings.json

@@ -1,21 +0,0 @@
-{
-  // See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file.
-  "configurations": [
-    {
-      "name": "x64-Debug",
-      "generator": "Visual Studio 15 2017 Win64",
-      "configurationType": "Debug",
-      "buildRoot": "H:\\Sapphire\\Sapphire-2.3-Build",
-      "cmakeCommandArgs": "-DCMAKE_BUILD_TYPE=\"Debug\"",
-      "buildCommandArgs": "-m -v:minimal"
-    },
-    {
-      "name": "x64-Release",
-      "generator": "Visual Studio 15 2017 Win64",
-      "configurationType": "Release",
-      "buildRoot": "H:\\Sapphire\\Sapphire-2.3-Build",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "-m -v:minimal"
-    }
-  ]
-}

cmake/FindMySQL.cmake

@@ -127,8 +127,8 @@ if( WIN32 )
       "${PROGRAM_FILES_64}/MariaDB 10.3/lib"
       "${PROGRAM_FILES_64}/MariaDB 10.4/lib"
       "${PROGRAM_FILES_64}/MariaDB 10.5/lib"
-      "${PROGRAM_FILES_64}/MariaDB 10.6/include/mysql"
+      "${PROGRAM_FILES_64}/MariaDB 10.6/lib"
-      "${PROGRAM_FILES_64}/MariaDB 10.7/include/mysql"
+      "${PROGRAM_FILES_64}/MariaDB 10.7/lib"
       "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib"
       "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt"
       "${PROGRAM_FILES_64}/MySQL/lib"
@@ -184,8 +184,8 @@ if( WIN32 )
         "${PROGRAM_FILES_64}/MariaDB 10.3/bin"
         "${PROGRAM_FILES_64}/MariaDB 10.4/bin"
         "${PROGRAM_FILES_64}/MariaDB 10.5/bin"
-        "${PROGRAM_FILES_64}/MariaDB 10.6/include/mysql"
+        "${PROGRAM_FILES_64}/MariaDB 10.6/bin"
-        "${PROGRAM_FILES_64}/MariaDB 10.7/include/mysql"
+        "${PROGRAM_FILES_64}/MariaDB 10.7/bin"
         "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin"
         "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt"
         "${PROGRAM_FILES_64}/MySQL/bin"

src/tools/CMakeLists.txt

@@ -24,7 +24,7 @@ add_subdirectory( "discovery_parser" )
 #add_subdirectory( "mob_parse" )
 add_subdirectory( "pcb_reader" )
 add_subdirectory( "nav_export" )
-add_subdirectory( "BattleNpcParserPs3" )
+#add_subdirectory( "BattleNpcParserPs3" )
 #add_subdirectory( "event_object_parser" )
 #add_subdirectory( "action_parse" )
 #add_subdirectory( "questbattle_bruteforce" )