Merge branch 'feature/redhat-compile-fixes'

jushar · jushar · commit e387cca8bf34 · 2016-10-04T16:18:03.000+02:00
diff --git a/Server/dbconmy/premake5.lua b/Server/dbconmy/premake5.lua
@@ -35,6 +35,11 @@ project "Dbconmy"
 	filter "system:not windows"
 		includedirs { "/usr/include/mysql" }
 		links { "mysqlclient", "rt" }
+
+	filter {"system:linux", "platforms:x86"}
+		libdirs { "/usr/lib32/mysql" }
+	filter {"system:linux", "platforms:x64"}
+		libdirs { "/usr/lib64/mysql" }
 	
 	filter { "system:windows", "platforms:x64" }
 		links { "../../vendor/mysql/lib/x64/libmysql.lib" }
diff --git a/premake5.lua b/premake5.lua
@@ -38,7 +38,7 @@ workspace "MTASA"
 	}
 		
 	-- Helper function for output path 
-	buildpath = function(p) return "%{wks.location}../Bin/"..p.."/" end
+	buildpath = function(p) return "%{wks.location}/../Bin/"..p.."/" end
 	copy = function(p) return "{COPY} %{cfg.buildtarget.abspath} %{wks.location}../Bin/"..p.."/" end 
 	
 	filter "platforms:x86"

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ workspace "MTASA"`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`-- Helper function for output path`
`41`		`- buildpath = function(p) return "%{wks.location}../Bin/"..p.."/" end`
	`41`	`+ buildpath = function(p) return "%{wks.location}/../Bin/"..p.."/" end`
`42`	`42`	`copy = function(p) return "{COPY} %{cfg.buildtarget.abspath} %{wks.location}../Bin/"..p.."/" end`
`43`	`43`
`44`	`44`	`filter "platforms:x86"`