Daniele Bartolini 10 лет назад
Родитель
Сommit
ac93df3cbb
2 измененных файлов с 20 добавлено и 4 удалено
  1. 19 2
      genie/crown.lua
  2. 1 2
      genie/openal.lua

+ 19 - 2
genie/crown.lua

@@ -71,7 +71,7 @@ function crown_project(_name, _kind, _defines)
 					CROWN_DIR .. "third/luajit/pre/win_x64"
 				}
 
-				configuration {}
+			configuration {}
 		end
 
 		if _OPTIONS["with-openal"] then
@@ -79,7 +79,22 @@ function crown_project(_name, _kind, _defines)
 				CROWN_DIR .. "third/openal/include"
 			}
 
-			links { "openal" }
+			-- Fix this in GENie
+			configuration { "debug", "x32", "linux-*" }
+				linkoptions { "-Lbin/debug", "-lopenal-debug-32", }
+			configuration { "development", "x32", "linux-*" }
+				linkoptions { "-Lbin/debug", "-lopenal-development-32", }
+			configuration { "release", "x32", "linux-*" }
+				linkoptions { "-Lbin/debug", "-lopenal-release-32", }
+			configuration { "debug", "x64", "linux-*" }
+				linkoptions { "-Lbin/debug", "-lopenal-debug-64", }
+			configuration { "development", "x64", "linux-*" }
+				linkoptions { "-Lbin/debug", "-lopenal-development-64", }
+			configuration { "release", "x64", "linux-*" }
+				linkoptions { "-Lbin/debug", "-lopenal-release-64", }
+
+			configuration { "vs*" }
+				links { "openal", }
 
 			configuration {}
 		end
@@ -124,6 +139,8 @@ function crown_project(_name, _kind, _defines)
 			links {
 				"bullet",
 			}
+
+			configuration {}
 		end
 
 		configuration { "debug or development" }

+ 1 - 2
genie/openal.lua

@@ -4,14 +4,13 @@
 --
 
 project "openal"
-	kind "StaticLib"
+	kind "SharedLib"
 
 	configuration {}
 
 	local AL_DIR = (CROWN_DIR .. "third/openal/")
 
 	defines {
-		"AL_LIBTYPE_STATIC",
 		"AL_ALEXT_PROTOTYPES",
 		"AL_BUILD_LIBRARY",
 		"_LARGEFILE_SOURCE",