From 7e693fcb77f75e4885a95849aa02bed492e4f845 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Wed, 5 Oct 2022 15:19:10 -0700
Subject: [PATCH] cmake for core (#322)

---
 build.sh | 12 +++++++-----
 clean.sh |  3 +--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index 30d9047..2a45d22 100755
--- a/build.sh
+++ b/build.sh
@@ -24,11 +24,11 @@ install_dir=${PWD}/simple64
 mkdir -p "${install_dir}"
 base_dir=${PWD}
 
-export OPTFLAGS="-O3 -flto -march=x86-64-v3"
-
-cd "${base_dir}/mupen64plus-core/projects/unix"
-make NETPLAY=1 NO_ASM=1 OSD=0 V=1 -j4 all
-cp -P "${base_dir}/mupen64plus-core/projects/unix/"*"${suffix}"* "${install_dir}"
+mkdir -p "${base_dir}/mupen64plus-core/build"
+cd "${base_dir}/mupen64plus-core/build"
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
+VERBOSE=1 cmake --build .
+cp ./*mupen64plus"${suffix}" "${install_dir}"
 cp "${base_dir}/mupen64plus-core/data/"* "${install_dir}"
 
 mkdir -p "${base_dir}/simple64-input-raphnetraw/build"
@@ -126,6 +126,8 @@ if [[ ${UNAME} == *"MINGW"* ]]; then
   cp -v "/${mingw_prefix}/bin/libintl-8.dll" "${install_dir}"
   cp -v "/${mingw_prefix}/bin/libiconv-2.dll" "${install_dir}"
   cp -v "/${mingw_prefix}/bin/libhidapi-0.dll" "${install_dir}"
+  cp -v "/${mingw_prefix}/bin/libcrypto-1_1-x64.dll" "${install_dir}" # used by Qt at runtime
+  cp -v "/${mingw_prefix}/bin/libssl-1_1-x64.dll" "${install_dir}" # used by Qt at runtime
   cp -v "${base_dir}/7za.exe" "${install_dir}"
   cp -v "${base_dir}/simple64-gui/discord/discord_game_sdk.dll" "${install_dir}"
   cp -v "${base_dir}/simple64-input-qt/vosk/vosk.dll" "${install_dir}"
diff --git a/clean.sh b/clean.sh
index c26aba1..35bbd78 100755
--- a/clean.sh
+++ b/clean.sh
@@ -4,8 +4,7 @@ set -e
 
 rm -rf simple64
 rm -rf simple64-audio-sdl2/build
-rm -rf mupen64plus-core/projects/unix/_obj
-rm -rf mupen64plus-core/projects/unix/libmupen64plus.dylib
+rm -rf mupen64plus-core/build
 rm -rf simple64-gui/build
 rm -rf simple64-input-qt/build
 rm -rf simple64-input-raphnetraw/build