Skip to content

Y
ygopro
Commit a4537fed authored by nanahira's avatar nanahira
Browse files
Options

fix macos libevent

parent df4db7a9
Pipeline #4143 passed with stages
          in 63 minutes and 41 seconds
          Hide whitespace changes
          Inline Side-by-side
          Showing with 2 additions and 2 deletions
          .gitlab-ci.yml
          View file @ a4537fed
          ...@@ -184,7 +184,7 @@ exec_macos: ...@@ -184,7 +184,7 @@ exec_macos:
          - obj/ - obj/
          script: script:
          - git submodule update --init - git submodule update --init
          - brew install libevent dylibbundler - brew install dylibbundler
          - sudo cp -rf irrklang/bin/macosx-gcc/libirrklang.dylib /usr/local/lib/ - sudo cp -rf irrklang/bin/macosx-gcc/libirrklang.dylib /usr/local/lib/
          #- sudo cp -rf irrklang/include /usr/local/include/irrklang #- sudo cp -rf irrklang/include /usr/local/include/irrklang
          - env YGOPRO_LIBEVENT_STATIC_PATH=$PWD/libevent-stable ./premake5 gmake --cc=clang - env YGOPRO_LIBEVENT_STATIC_PATH=$PWD/libevent-stable ./premake5 gmake --cc=clang
          ......
          premake5.lua
          View file @ a4537fed
          ...@@ -70,8 +70,8 @@ end ...@@ -70,8 +70,8 @@ end
          defines { "LUA_USE_MACOSX", "DBL_MAX_10_EXP=+308", "DBL_MANT_DIG=53", "GL_SILENCE_DEPRECATION" } defines { "LUA_USE_MACOSX", "DBL_MAX_10_EXP=+308", "DBL_MANT_DIG=53", "GL_SILENCE_DEPRECATION" }
          if not LIBEVENT_ROOT then if not LIBEVENT_ROOT then
          includedirs { "/usr/local/include/event2" } includedirs { "/usr/local/include/event2" }
          libdirs { "/usr/local/lib" }
          end end
          libdirs { "/usr/local/lib" }
          buildoptions { "-stdlib=libc++" } buildoptions { "-stdlib=libc++" }
          if MAC_ARM then if MAC_ARM then
          buildoptions { "--target=arm64-apple-macos11" } buildoptions { "--target=arm64-apple-macos11" }
          ......
          Markdown is supported
          0% or
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment