diff options
Diffstat (limited to 'other/sdl')
| -rw-r--r-- | other/sdl/lib32/SDL.dll (renamed from other/sdl/vc2005libs/SDL.dll) | bin | 343552 -> 343552 bytes | |||
| -rw-r--r-- | other/sdl/lib32/SDL.lib (renamed from other/sdl/vc2005libs/SDL.lib) | bin | 42698 -> 42698 bytes | |||
| -rw-r--r-- | other/sdl/lib32/SDLmain.lib (renamed from other/sdl/vc2005libs/SDLmain.lib) | bin | 22852 -> 22852 bytes | |||
| -rw-r--r-- | other/sdl/lib64/SDL.dll | bin | 0 -> 389120 bytes | |||
| -rw-r--r-- | other/sdl/lib64/SDL.lib | bin | 0 -> 41684 bytes | |||
| -rw-r--r-- | other/sdl/lib64/SDLmain.lib | bin | 0 -> 25406 bytes | |||
| -rw-r--r-- | other/sdl/sdl.lua | 20 |
7 files changed, 14 insertions, 6 deletions
diff --git a/other/sdl/vc2005libs/SDL.dll b/other/sdl/lib32/SDL.dll index 429ae545..429ae545 100644 --- a/other/sdl/vc2005libs/SDL.dll +++ b/other/sdl/lib32/SDL.dll Binary files differdiff --git a/other/sdl/vc2005libs/SDL.lib b/other/sdl/lib32/SDL.lib index f4e860f8..f4e860f8 100644 --- a/other/sdl/vc2005libs/SDL.lib +++ b/other/sdl/lib32/SDL.lib Binary files differdiff --git a/other/sdl/vc2005libs/SDLmain.lib b/other/sdl/lib32/SDLmain.lib index 825c03b9..825c03b9 100644 --- a/other/sdl/vc2005libs/SDLmain.lib +++ b/other/sdl/lib32/SDLmain.lib Binary files differdiff --git a/other/sdl/lib64/SDL.dll b/other/sdl/lib64/SDL.dll new file mode 100644 index 00000000..3d4b1c2a --- /dev/null +++ b/other/sdl/lib64/SDL.dll Binary files differdiff --git a/other/sdl/lib64/SDL.lib b/other/sdl/lib64/SDL.lib new file mode 100644 index 00000000..489ba5d3 --- /dev/null +++ b/other/sdl/lib64/SDL.lib Binary files differdiff --git a/other/sdl/lib64/SDLmain.lib b/other/sdl/lib64/SDLmain.lib new file mode 100644 index 00000000..b5f8e8fe --- /dev/null +++ b/other/sdl/lib64/SDLmain.lib Binary files differdiff --git a/other/sdl/sdl.lua b/other/sdl/sdl.lua index 23b287c7..14183205 100644 --- a/other/sdl/sdl.lua +++ b/other/sdl/sdl.lua @@ -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 |