Permalink
Browse files

fixed win64 building

  • Loading branch information...
1 parent 2df6e0d commit f12095fb512a4dc5e18c639be4474787e7053856 @oy oy committed Dec 4, 2011
View
@@ -113,8 +113,13 @@ client_depends = {}
server_link_other = {}
if family == "windows" then
- table.insert(client_depends, CopyToDirectory(".", "other\\freetype\\lib\\freetype.dll"))
- table.insert(client_depends, CopyToDirectory(".", "other\\sdl\\vc2005libs\\SDL.dll"))
+ if platform == "win32" then
+ table.insert(client_depends, CopyToDirectory(".", "other\\freetype\\lib32\\freetype.dll"))
+ table.insert(client_depends, CopyToDirectory(".", "other\\sdl\\lib32\\SDL.dll"))
+ else
+ table.insert(client_depends, CopyToDirectory(".", "other\\freetype\\lib64\\freetype.dll"))
+ table.insert(client_depends, CopyToDirectory(".", "other\\sdl\\lib64\\SDL.dll"))
+ end
if config.compiler.driver == "cl" then
client_link_other = {ResCompile("other/icons/teeworlds_cl.rc")}
@@ -5,7 +5,7 @@ FreeType = {
local check = function(option, settings)
option.value = false
option.use_ftconfig = false
- option.use_win32lib = false
+ option.use_winlib = 0
option.lib_path = nil
if ExecuteSilent("freetype-config") > 0 and ExecuteSilent("freetype-config --cflags") == 0 then
@@ -15,7 +15,10 @@ FreeType = {
if platform == "win32" then
option.value = true
- option.use_win32lib = true
+ option.use_winlib = 32
+ elseif platform == "win64" then
+ option.value = true
+ option.use_winlib = 64
end
end
@@ -27,22 +30,27 @@ FreeType = {
settings.cc.flags:Add("`freetype-config --cflags`")
settings.link.flags:Add("`freetype-config --libs`")
- elseif option.use_win32lib == true then
- settings.link.libpath:Add(FreeType.basepath .. "/lib")
+ elseif option.use_winlib > 0 then
+ if option.use_winlib == 32 then
+ settings.link.libpath:Add(FreeType.basepath .. "/lib32")
+ else
+ settings.link.libpath:Add(FreeType.basepath .. "/lib64")
+ end
settings.link.libs:Add("freetype")
end
end
local save = function(option, output)
output:option(option, "value")
output:option(option, "use_ftconfig")
- output:option(option, "use_win32lib")
+ output:option(option, "use_winlib")
end
local display = function(option)
if option.value == true then
if option.use_ftconfig == true then return "using freetype-config" end
- if option.use_win32lib == true then return "using supplied win32 libraries" end
+ if option.use_winlib == 32 then return "using supplied win32 libraries" end
+ if option.use_winlib == 64 then return "using supplied win64 libraries" end
return "using unknown method"
else
if option.required then
Binary file not shown.
View
@@ -5,7 +5,7 @@ SDL = {
local check = function(option, settings)
option.value = false
option.use_sdlconfig = false
- option.use_win32sdl = false
+ option.use_winlib = 0
option.use_osxframework = false
option.lib_path = nil
@@ -16,7 +16,10 @@ SDL = {
if platform == "win32" then
option.value = true
- option.use_win32sdl = true
+ option.use_winlib = 32
+ elseif platform == "win64" then
+ option.value = true
+ option.use_winlib = 64
end
if platform == "macosx" then
@@ -37,9 +40,13 @@ SDL = {
client_settings.cc.includes:Add("/Library/Frameworks/SDL.framework/Headers")
end
- if option.use_win32sdl == true then
+ if option.use_winlib > 0 then
settings.cc.includes:Add(SDL.basepath .. "/include")
- settings.link.libpath:Add(SDL.basepath .. "/vc2005libs")
+ if option.use_winlib == 32 then
+ settings.link.libpath:Add(SDL.basepath .. "/lib32")
+ else
+ settings.link.libpath:Add(SDL.basepath .. "/lib64")
+ end
settings.link.libs:Add("SDL")
settings.link.libs:Add("SDLmain")
end
@@ -48,14 +55,15 @@ SDL = {
local save = function(option, output)
output:option(option, "value")
output:option(option, "use_sdlconfig")
- output:option(option, "use_win32sdl")
+ output:option(option, "use_winlib")
output:option(option, "use_osxframework")
end
local display = function(option)
if option.value == true then
if option.use_sdlconfig == true then return "using sdl-config" end
- if option.use_win32sdl == true then return "using supplied win32 libraries" end
+ if option.use_winlib == 32 then return "using supplied win32 libraries" end
+ if option.use_winlib == 64 then return "using supplied win64 libraries" end
if option.use_osxframework == true then return "using osx framework" end
return "using unknown method"
else
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -101,15 +101,15 @@
#endif
#endif
-#if defined(__ia64__)
+#if defined(__ia64__) || defined(_M_IA64)
#define CONF_ARCH_IA64 1
#define CONF_ARCH_STRING "ia64"
#if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
#define CONF_ARCH_ENDIAN_LITTLE 1
#endif
#endif
-#if defined(__amd64__) || defined(__x86_64__)
+#if defined(__amd64__) || defined(__x86_64__) || defined(_M_X64)
#define CONF_ARCH_AMD64 1
#define CONF_ARCH_STRING "amd64"
#if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)

0 comments on commit f12095f

Please sign in to comment.