Commit dada99ea authored by mercury233's avatar mercury233

Merge branch 'fh' into patch-event-2.1.12-win

parents 8c3f3d98 38e198de
...@@ -11,6 +11,10 @@ project "YGOPro" ...@@ -11,6 +11,10 @@ project "YGOPro"
includedirs { "../ocgcore" } includedirs { "../ocgcore" }
links { "ocgcore", "clzma", "cspmemvfs", LUA_LIB_NAME, "sqlite3", "irrlicht", "freetype", "event" } links { "ocgcore", "clzma", "cspmemvfs", LUA_LIB_NAME, "sqlite3", "irrlicht", "freetype", "event" }
if not BUILD_LUA then
libdirs { LUA_LIB_DIR }
end
if BUILD_EVENT then if BUILD_EVENT then
includedirs { "../event/include" } includedirs { "../event/include" }
else else
...@@ -71,7 +75,7 @@ project "YGOPro" ...@@ -71,7 +75,7 @@ project "YGOPro"
entrypoint "mainCRTStartup" entrypoint "mainCRTStartup"
defines { "_IRR_WCHAR_FILESYSTEM" } defines { "_IRR_WCHAR_FILESYSTEM" }
files "ygopro.rc" files "ygopro.rc"
links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32", "iphlpapi" } links { "ws2_32", "iphlpapi" }
if USE_AUDIO and AUDIO_LIB == "irrklang" then if USE_AUDIO and AUDIO_LIB == "irrklang" then
links { "irrKlang" } links { "irrKlang" }
if IRRKLANG_PRO then if IRRKLANG_PRO then
...@@ -83,11 +87,10 @@ project "YGOPro" ...@@ -83,11 +87,10 @@ project "YGOPro"
filter {} filter {}
end end
end end
filter "not system:windows"
links { "dl", "pthread" }
filter "system:macosx" filter "system:macosx"
openmp "Off" openmp "Off"
links { "z" } links { "OpenGL.framework", "Cocoa.framework", "IOKit.framework" }
defines { "GL_SILENCE_DEPRECATION" } defines { "GL_SILENCE_DEPRECATION" }
if MAC_ARM then if MAC_ARM then
linkoptions { "-arch arm64" } linkoptions { "-arch arm64" }
...@@ -98,6 +101,7 @@ project "YGOPro" ...@@ -98,6 +101,7 @@ project "YGOPro"
if USE_AUDIO and AUDIO_LIB == "irrklang" then if USE_AUDIO and AUDIO_LIB == "irrklang" then
links { "irrklang" } links { "irrklang" }
end end
filter "system:linux" filter "system:linux"
links { "GL", "X11", "Xxf86vm" } links { "GL", "X11", "Xxf86vm" }
linkoptions { "-fopenmp" } linkoptions { "-fopenmp" }
......
...@@ -161,9 +161,6 @@ project "irrlicht" ...@@ -161,9 +161,6 @@ project "irrlicht"
defines { "NO_IRR_COMPILE_WITH_DIRECT3D_9_" } defines { "NO_IRR_COMPILE_WITH_DIRECT3D_9_" }
end end
filter { "system:linux" }
links { "X11", "Xxf86vm" }
filter { "system:macosx" } filter { "system:macosx" }
cppdialect "gnu++14" cppdialect "gnu++14"
defines { "GL_SILENCE_DEPRECATION" } defines { "GL_SILENCE_DEPRECATION" }
......
...@@ -138,6 +138,3 @@ project "miniaudio" ...@@ -138,6 +138,3 @@ project "miniaudio"
includedirs { OPUS_INCLUDE_DIR, OPUSFILE_INCLUDE_DIR, VORBIS_INCLUDE_DIR, OGG_INCLUDE_DIR } includedirs { OPUS_INCLUDE_DIR, OPUSFILE_INCLUDE_DIR, VORBIS_INCLUDE_DIR, OGG_INCLUDE_DIR }
end end
end end
filter "system:linux"
links { "dl", "pthread", "m" }
...@@ -293,7 +293,6 @@ workspace "YGOPro" ...@@ -293,7 +293,6 @@ workspace "YGOPro"
if MAC_ARM and MAC_INTEL then if MAC_ARM and MAC_INTEL then
architecture "universal" architecture "universal"
end end
links { "OpenGL.framework", "Cocoa.framework", "IOKit.framework" }
filter "system:linux" filter "system:linux"
buildoptions { "-U_FORTIFY_SOURCE" } buildoptions { "-U_FORTIFY_SOURCE" }
......
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