updatepremake

gframe/premake4.lua

@@ -7,18 +7,24 @@ project "ygopro"
     excludes "lzma/**"
     includedirs { "../ocgcore" }
     links { "ocgcore", "clzma", "Irrlicht", "freetype", "sqlite3", "lua" , "event" }
+    if USE_IRRKLANG then
+        defines { "YGOPRO_USE_IRRKLANG" }
+        links { "irrKlang" }
+        if USE_IKPMP3 then
+		    links { "ikpMP3" }
+            defines { "YGOPRO_USE_IKPMP3" }
+        end
+        if IRRKLANG_PRO then
+            defines { "IRRKLANG_STATIC" }
+        end
+    end
 
     configuration "windows"
         files "ygopro.rc"
         excludes "CGUIButton.cpp"
         includedirs { "../irrlicht/include", "../freetype/include", "../event/include", "../sqlite3" }
         if USE_IRRKLANG then
-            defines { "YGOPRO_USE_IRRKLANG" }
-            links { "irrKlang", "ikpMP3" }
             includedirs { "../irrklang/include" }
-            if IRRKLANG_PRO then
-                defines { "IRRKLANG_STATIC", "YGOPRO_USE_IKPMP3" }
-            end
             libdirs { "../irrklang/lib/Win32-visualStudio" }
         end
         links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
@@ -30,7 +36,3 @@ project "ygopro"
         includedirs { "/usr/include/lua", "/usr/include/lua5.3", "/usr/include/lua/5.3", "/usr/include/irrlicht", "/usr/include/freetype2" }
         excludes { "COSOperator.*" }
         links { "event_pthreads", "GL", "dl", "pthread" }
-        if USE_IRRKLANG then
-            defines { "YGOPRO_USE_IRRKLANG", "YGOPRO_USE_IKPMP3" }
-            links { "irrKlang" }
-        end

premake5.lua

@@ -79,6 +79,6 @@ solution "ygo"
 		include "lua"
 		include "sqlite3"
     end
-    if IRRKLANG_PRO or USE_IKPMP3 then
+    if USE_IKPMP3 then
         include "ikpmp3"
     end