Merge branch 'develop-static-build' into server-develop-static-build

.ci/build-opus.sh

-#!/bin/sh
-set -x
-set -o errexit
-
-if [ -n "$NO_AUDIO" ]; then
-  echo "Skipping opus build because NO_AUDIO is set"
-  exit 0
-fi
-
-cd miniaudio
-
-external_built_dir="$PWD/external-built"
-
-is_macos=false
-if [ "$(uname)" = "Darwin" ]; then
-  is_macos=true
-fi
-
-maybe_patch_configure() {
-  if $is_macos; then
-    sed -i.bak 's/-force_cpusubtype_ALL//g' configure*
-  fi
-}
-
-build_single_thing() {
-  lib_name="$1"
-  cd "external/$lib_name"
-  shift
-  maybe_patch_configure
-  PKG_CONFIG_PATH="$external_built_dir/lib/pkgconfig" CFLAGS="$OPUS_FLAGS" CXXFLAGS="$OPUS_FLAGS" ./configure --prefix="$external_built_dir" --enable-static=yes --enable-shared=no "$@"
-  make -j$(nproc)
-  make install
-  cd ../..
-}
-
-build_single_thing ogg
-build_single_thing opus
-build_single_thing opusfile --disable-examples --disable-http
-build_single_thing vorbis --with-ogg="$external_built_dir"
-
-cd ..

.ci/configure-libevent.sh

+#!/bin/sh
+set -x
+set -o errexit
+
+cd event
+./configure --disable-openssl --enable-static=yes --enable-shared=no
+sed -f make-event-config.sed < config.h > ./include/event2/event-config.h
+cd ..

.ci/exec-macos-platform.sh

@@ -4,25 +4,12 @@ set -o errexit
 
 TARGET_PLATFORM=$(arch)
 TARGET_YGOPRO_BINARY_PATH=./ygopro-platforms/ygopro-platform-$TARGET_PLATFORM
-export EVENT_INCLUDE_DIR=$PWD/libevent-stable/include
-export EVENT_LIB_DIR=$PWD/libevent-stable/lib
-export OPUS_INCLUDE_DIR=$PWD/miniaudio/external-built/include/opus
-export OPUS_LIB_DIR=$PWD/miniaudio/external-built/lib
-export OPUSFILE_INCLUDE_DIR=$PWD/miniaudio/external-built/include/opus
-export OPUSFILE_LIB_DIR=$PWD/miniaudio/external-built/lib
-export VORBIS_INCLUDE_DIR=$PWD/miniaudio/external-built/include
-export VORBIS_LIB_DIR=$PWD/miniaudio/external-built/lib
-export OGG_INCLUDE_DIR=$PWD/miniaudio/external-built/include
-export OGG_LIB_DIR=$PWD/miniaudio/external-built/lib
-export ACLOCAL=aclocal
-export AUTOMAKE=automake
-
-./.ci/libevent-prebuild.sh
-./.ci/build-opus.sh
+
+./.ci/configure-libevent.sh
 
 rm -rf sqlite3/VERSION sqlite3/version
 
-./premake5 gmake --cc=clang --build-freetype --build-sqlite
+./premake5 gmake --cc=clang
 
 cd build
 make config=release -j$(sysctl -n hw.ncpu)

.ci/libevent-prebuild.sh

-#!/bin/sh
-set -x
-set -o errexit
-# PROCESSOR_COUNT=4
-
-if [ -d "libevent-stable" ]; then
-  rm -rf libevent-stable
-fi
-
-if [ ! -d "libevent-2.1.12-stable" ]; then
-  wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/libevent-2.1.12-stable.tar.gz | tar zfx -
-fi
-
-install_path="$PWD/libevent-stable"
-
-cd libevent-2.1.12-stable
-./configure "--prefix=$install_path" --disable-openssl --enable-static=yes --enable-shared=no "$@"
-make -j$(nproc)
-make install
-cd ..

.gitlab-ci.yml

@@ -22,6 +22,9 @@ mat_common:
     # freetype
     #- wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/freetype-2.13.3.tar.gz | tar zfx -
     #- mv freetype-2.13.3 freetype
+    # event
+    - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/libevent-2.1.12-stable.tar.gz | tar zfx -
+    - mv libevent-2.1.12-stable event
     # irrlicht
     - ./.ci/prepare-irrlicht.sh
     # miniaudio
@@ -33,6 +36,7 @@ mat_common:
       - lua
       #- freetype
       - sqlite3
+      - event
       - irrlicht
       #- miniaudio
 
@@ -83,13 +87,9 @@ mat_windows:
     # premake5.exe
     - wget https://cdn02.moecube.com:444/ygopro-build-materials/premake-5.0.0-beta6-windows.zip
     - 7z x -y premake-5.0.0-beta6-windows.zip
-    # event
-    - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/libevent-2.1.12-stable.tar.gz | tar zfx -
-    - mv libevent-2.1.12-stable event
   artifacts:
     paths:
       - premake5.exe
-      - event
 
 ._exec_build:
   stage: build
@@ -169,8 +169,6 @@ exec_windows_pro3:
   variables:
     BUILD_SQLITE: '1'
     SERVER_ZIP_SUPPORT: '1'
-    EVENT_INCLUDE_DIR: /usr/share/libevent-stable/include
-    EVENT_LIB_DIR: /usr/share/libevent-stable/lib
     RELEASE_DIR: linux-x64
 
 .exec_debian:
@@ -240,14 +238,11 @@ exec_debianarm:
     - mat_common
     - mat_macos
     - mat_submodules
-  before_script:
-    - env CFLAGS=$LIBEVENT_PREBUILD_FLAGS CXXFLAGS=$LIBEVENT_PREBUILD_FLAGS ./.ci/libevent-prebuild.sh
   variables:
     PREMAKE5_BIN: ./premake5
     BUILD_SQLITE: '1'
+    BUILD_EVENT: '1'
     SERVER_ZIP_SUPPORT: '1'
-    EVENT_INCLUDE_DIR: ../libevent-stable/include
-    EVENT_LIB_DIR: ../libevent-stable/lib
 
 exec_macos_x64:
   extends: .exec_macos_platform

gframe/premake5.lua

@@ -59,6 +59,7 @@ end
     else
         includedirs { EVENT_INCLUDE_DIR }
         libdirs { EVENT_LIB_DIR }
+        links { "event_pthreads" }
     end
 
     if BUILD_IRRLICHT then
@@ -133,7 +134,7 @@ end
             end
         end
     filter "not system:windows"
-        links { "event_pthreads", "dl", "pthread", "resolv" }
+        links { "dl", "pthread", "resolv" }
     filter "system:macosx"
 if not SERVER_MODE then
         openmp "Off"
@@ -141,9 +142,11 @@ if not SERVER_MODE then
         defines { "GL_SILENCE_DEPRECATION" }
 end
         if MAC_ARM then
-            buildoptions { "--target=arm64-apple-macos12" }
             linkoptions { "-arch arm64" }
         end
+        if MAC_INTEL then
+            linkoptions { "-arch x86_64" }
+        end
         if USE_AUDIO and AUDIO_LIB == "irrklang" then
             links { "irrklang" }
         end

premake/event/premake5.lua

@@ -17,3 +17,9 @@ project "event"
                            "xcopy /E /Y $(ProjectDir)..\\event\\WIN32-Code\\nmake $(ProjectDir)..\\event\\include" }
         files { "win32select.c", "evthread_win32.c", "buffer_iocp.c", "event_iocp.c", "bufferevent_async.c" }
         defines { "UINT32_MAX=0xffffffffui32" } -- quirk of libevent 2.1.2
+
+    filter "system:linux"
+        files { "evthread_pthread.c", "epoll.c", "epoll_sub.c", "poll.c", "select.c" }
+
+    filter "system:macosx"
+        files { "evthread_pthread.c", "kqueue.c", "poll.c", "select.c" }

premake/miniaudio/premake5.lua

@@ -33,12 +33,6 @@ project "miniaudio"
                 "external/opus/celt/rate.c",
                 "external/opus/celt/vq.c",
 
-                "external/opus/celt/x86/pitch_avx.c",
-                "external/opus/celt/x86/pitch_sse.c",
-                "external/opus/celt/x86/vq_sse2.c",
-                "external/opus/celt/x86/x86_celt_map.c",
-                "external/opus/celt/x86/x86cpu.c",
-
                 "external/opus/silk/bwexpander.c",
                 "external/opus/silk/bwexpander_32.c",
                 "external/opus/silk/CNG.c",
@@ -118,10 +112,25 @@ project "miniaudio"
                 "external/vorbis/include",
             }
             defines {
-                "OPUS_BUILD", "USE_ALLOCA", "HAVE_LRINTF", "OP_HAVE_LRINTF",
-                "OPUS_X86_PRESUME_SSE", "OPUS_X86_PRESUME_SSE2",
-                "OPUS_HAVE_RTCD", "OPUS_X86_MAY_HAVE_SSE", "OPUS_X86_MAY_HAVE_SSE4_1", "OPUS_X86_MAY_HAVE_AVX2",
+                "OPUS_BUILD",
+                "USE_ALLOCA",
+                "HAVE_LRINTF",
+                "OP_HAVE_LRINTF",
             }
+            if not TARGET_MAC_ARM then
+                files {
+                    "external/opus/celt/x86/pitch_avx.c",
+                    "external/opus/celt/x86/pitch_sse.c",
+                    "external/opus/celt/x86/vq_sse2.c",
+                    "external/opus/celt/x86/x86_celt_map.c",
+                    "external/opus/celt/x86/x86cpu.c",
+                }
+                defines {
+                    "OPUS_HAVE_RTCD", "CPU_INFO_BY_ASM",
+                    "OPUS_X86_PRESUME_SSE", "OPUS_X86_PRESUME_SSE2",
+                    "OPUS_X86_MAY_HAVE_SSE", "OPUS_X86_MAY_HAVE_SSE4_1", "OPUS_X86_MAY_HAVE_AVX2",
+                }
+            end
         else
             includedirs { OPUS_INCLUDE_DIR, OPUSFILE_INCLUDE_DIR, VORBIS_INCLUDE_DIR, OGG_INCLUDE_DIR }
         end

premake5.lua

--- default global settings
+-- Supported systems: Windows, Linux, MacOS
+
+-- Global settings
+
+-- Default: Build Lua, Irrlicht from source on all systems.
+--          Don't build event, freetype, sqlite, opus, vorbis on Linux or MacOS, use apt or homebrew,
+--          but build them on Windows, due to the lack of package manager on Windows.
 
 BUILD_LUA = true
-LUA_LIB_NAME = "lua"
+LUA_LIB_NAME = "lua" -- change this if you don't build Lua
 
 BUILD_EVENT = os.istarget("windows")
 BUILD_FREETYPE = os.istarget("windows")
 BUILD_SQLITE = os.istarget("windows")
-BUILD_IRRLICHT = true
+BUILD_IRRLICHT = true -- modified Irrlicht is required, can't use the official one
 USE_DXSDK = true
 
 USE_AUDIO = true
-AUDIO_LIB = "miniaudio"
+AUDIO_LIB = "miniaudio" -- can be "miniaudio" or "irrklang"
+-- BUILD_MINIAUDIO is always true
 MINIAUDIO_SUPPORT_OPUS_VORBIS = true
 MINIAUDIO_BUILD_OPUS_VORBIS = os.istarget("windows")
+-- BUILD_IRRKLANG is impossible because irrKlang is not open source
 IRRKLANG_PRO = false
 IRRKLANG_PRO_BUILD_IKPMP3 = false
 
@@ -23,7 +31,7 @@ SERVER_PRO3_SUPPORT = false
 SERVER_TAG_SURRENDER_CONFIRM = false
 USE_IRRKLANG = false
 
--- read settings from command line or environment variables
+-- Read settings from command line or environment variables
 
 newoption { trigger = "build-lua", category = "YGOPro - lua", description = "" }
 newoption { trigger = "no-build-lua", category = "YGOPro - lua", description = "" }
@@ -81,7 +89,8 @@ newoption { trigger = "irrklang-pro-debug-lib-dir", category = "YGOPro - irrklan
 newoption { trigger = 'build-ikpmp3', category = "YGOPro - irrklang - ikpmp3", description = "" }
 
 newoption { trigger = "winxp-support", category = "YGOPro", description = "" }
-newoption { trigger = "mac-arm", category = "YGOPro", description = "Cross compile for Apple Silicon" }
+newoption { trigger = "mac-arm", category = "YGOPro", description = "Compile for Apple Silicon Mac" }
+newoption { trigger = "mac-intel", category = "YGOPro", description = "Compile for Intel Mac" }
 
 newoption { trigger = "server-mode", category = "YGOPro - server", description = "" }
 newoption { trigger = "server-zip-support", category = "YGOPro - server", description = "" }
@@ -149,9 +158,9 @@ elseif GetParam("no-build-lua") then
     BUILD_LUA = false
 end
 if not BUILD_LUA then
-    -- at most times you need to change this if you change BUILD_LUA to false
+    -- at most times you need to change those if you change BUILD_LUA to false
     -- make sure your lua lib is built with C++ and version >= 5.3
-    LUA_LIB_NAME = GetParam("lua-lib-name")
+    LUA_LIB_NAME = GetParam("lua-lib-name") or LUA_LIB_NAME
     LUA_INCLUDE_DIR = GetParam("lua-include-dir") or os.findheader("lua.h")
     LUA_LIB_DIR = GetParam("lua-lib-dir") or os.findlib(LUA_LIB_NAME)
 end
@@ -177,7 +186,7 @@ if GetParam("lua-deb") then
 end
 
 if GetParam("build-event") then
-    BUILD_EVENT = os.istarget("windows") -- only on windows for now
+    BUILD_EVENT = true
 elseif GetParam("no-build-event") then
     BUILD_EVENT = false
 end
@@ -350,8 +359,9 @@ if SERVER_MODE then
 end
 
 function isRunningUnderRosetta()
-    local rosetta_result=spawn("sysctl -n sysctl.proc_translated 2>/dev/null")
-    return tonumber(rosetta_result) == 1
+    local uname = os.outputof("uname -m")
+    local proctranslated = os.outputof("sysctl sysctl.proc_translated")
+    return uname:find("arm") or proctranslated
 end
 
 function IsRunningUnderARM()
@@ -393,8 +403,25 @@ function isARM()
     return false
 end
 
-IS_ARM=isARM() or GetParam("mac-arm") -- detect if the current system is ARM
-MAC_ARM=os.istarget("macosx") and IS_ARM
+IS_ARM=isARM()
+
+if os.istarget("macosx") then
+    if GetParam("mac-arm") then
+        MAC_ARM = true
+    end
+    if GetParam("mac-intel") then
+        MAC_INTEL = true
+    end
+    
+    if MAC_ARM then
+        TARGET_MAC_ARM = true
+    elseif not MAC_INTEL then
+        -- automatic target arm64, need extra detect
+        if isRunningUnderRosetta() then
+            TARGET_MAC_ARM = true
+        end
+    end
+end
 
 workspace "YGOPro"
     location "build"
@@ -431,7 +458,13 @@ workspace "YGOPro"
     filter "system:macosx"
         libdirs { "/usr/local/lib" }
         if MAC_ARM then
-            buildoptions { "--target=arm64-apple-macos12" }
+            buildoptions { "-arch arm64" }
+        end
+        if MAC_INTEL then
+            buildoptions { "-arch x86_64", "-mavx", "-mfma" }
+        end
+        if MAC_ARM and MAC_INTEL then
+            architecture "universal"
         end
 if not SERVER_MODE then
         links { "OpenGL.framework", "Cocoa.framework", "IOKit.framework" }
@@ -473,17 +506,6 @@ end
     filter { "configurations:Release", "not action:vs*" }
         symbols "On"
         defines "NDEBUG"
-        if not IS_ARM then
-            buildoptions "-march=native"
-        end
-        if IS_ARM and not MAC_ARM then
-            buildoptions {
-                "-march=armv8-a",
-                "-mtune=cortex-a72",
-                "-Wno-psabi"
-            }
-            pic "On"
-        end
 
     filter { "configurations:Debug", "action:vs*" }
         disablewarnings { "6011", "6031", "6054", "6262" }
@@ -499,6 +521,17 @@ end
 
     filter "not action:vs*"
         buildoptions { "-fno-strict-aliasing", "-Wno-multichar", "-Wno-format-security" }
+        if not IS_ARM and not MAC_INTEL then
+            buildoptions "-march=native"
+        end
+        if IS_ARM and not MAC_ARM then
+            buildoptions {
+                "-march=armv8-a",
+                "-mtune=cortex-a72",
+                "-Wno-psabi"
+            }
+            pic "On"
+        end
 
 if SERVER_PRO3_SUPPORT then
     filter "not action:vs*"