mgconfl

gframe/premake4.lua

@@ -14,10 +14,9 @@ project "ygopro"
         includedirs { "../irrlicht/include", "../freetype/include", "../event/include", "../sqlite3" }
         if USE_IRRKLANG then
 			defines { "YGOPRO_USE_IRRKLANG" }
-            links { "irrKlang" }
+			links { "irrKlang", "ikpMP3" }
 			includedirs { "../irrklang/include" }
 			if IRRKLANG_PRO then
-                links { "ikpMP3" }
 				defines { "IRRKLANG_STATIC" }
 			end
 			libdirs { "../irrklang/lib/Win32-visualStudio" }

premake4.lua

@@ -2,10 +2,17 @@ solution "ygo"
     location "build"
     language "C++"
     objdir "obj"
+<<<<<<< HEAD
     startproject "ygopro"
 
     configurations { "Debug", "Release" }
     defines { "LUA_COMPAT_5_2" }
+=======
+	startproject "ygopro"
+
+    configurations { "Debug", "Release" }
+	defines { "LUA_COMPAT_5_2" }
+>>>>>>> mactest
 
     configuration "windows"
         defines { "WIN32", "_WIN32" }

premake5.lua

@@ -2,6 +2,7 @@ solution "ygo"
     location "build"
     language "C++"
     objdir "obj"
+<<<<<<< HEAD
     if os.ishost("windows") or os.getenv("USE_IRRKLANG") then
         USE_IRRKLANG = true
         if os.getenv("irrklang_pro") then
@@ -12,6 +13,18 @@ solution "ygo"
 
     configurations { "Debug", "Release" }
     defines { "LUA_COMPAT_5_2" }
+=======
+	if os.ishost("windows") or os.getenv("USE_IRRKLANG") then
+		USE_IRRKLANG = true
+		if os.getenv("irrklang_pro") then
+			IRRKLANG_PRO = true
+		end
+	end
+	startproject "ygopro"
+
+    configurations { "Debug", "Release" }
+	defines { "LUA_COMPAT_5_2" }
+>>>>>>> mactest
 
     configuration "windows"
         defines { "WIN32", "_WIN32", "WINVER=0x0501" }