Merge branch 'dev'

CMakeLists.txt

@@ -13,8 +13,8 @@ if (${CMAKE_C_COMPILER_ID} STREQUAL GNU)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native -Wall -Wextra")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
 elseif (${CMAKE_C_COMPILER_ID} MATCHES Clang)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native -Wall -Wextra -Wno-missing-field-initializers")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Wno-missing-field-initializers")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-missing-field-initializers")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-missing-field-initializers")
 elseif (${CMAKE_C_COMPILER_ID} STREQUAL MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS=1 -D_UNICODE -DUNICODE)
 endif()

build.sh

@@ -86,6 +86,11 @@ if [ $build_mugglec -eq 1 ]; then
 	fi
 	cd $mugglec_build_dir
 
+	# patch for mac
+	if [[ "$OSTYPE" == "darwin"* ]]; then
+		cp $origin_dir/patch_scripts/mugglec_cmakelist.txt $mugglec_src_dir/CMakeLists.txt
+	fi
+
 	cmake \
 		-S $mugglec_src_dir -B $mugglec_build_dir \
 		-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
@@ -160,5 +165,9 @@ cmake --build $build_dir --target install
 
 # package
 cd $install_dir
-tar -czvf yoauth.tar.gz bin/yoauth* lib/*.so*
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	tar -czvf yoauth.tar.gz bin/yoauth* lib/*.dylib*
+else
+	tar -czvf yoauth.tar.gz bin/yoauth* lib/*.so*
+fi
 mv yoauth.tar.gz $pkg_dir