edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed win64 building

Browse source
This commit is contained in:
oy 2011-12-04 22:28:58 +01:00
parent 2df6e0d04d
commit f12095fb51
8 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bam.lua
View file

@ -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")}

20
other/freetype/freetype.lua
View file

@ -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,8 +30,12 @@ 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
@ -36,13 +43,14 @@ FreeType = {
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

BIN
other/freetype/lib/freetype.lib
View file

Binary file not shown.

20
other/sdl/sdl.lua
View file

@ -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

BIN
other/sdl/vc2005libs/SDL.dll
View file

Binary file not shown.

BIN
other/sdl/vc2005libs/SDL.lib
View file

Binary file not shown.

BIN
other/sdl/vc2005libs/SDLmain.lib
View file

Binary file not shown.

4
src/base/detect.h
View file

@ -101,7 +101,7 @@
#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)
@ -109,7 +109,7 @@
#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)