diff options
| author | Teetime <TeetimeTW@yahoo.de> | 2012-02-17 19:31:43 +0100 |
|---|---|---|
| committer | Teetime <TeetimeTW@yahoo.de> | 2012-02-17 19:31:43 +0100 |
| commit | fc99167e687ba688ce9306bbec7e801450c917be (patch) | |
| tree | b440f2568a98b4b6a8db17925a299142adead7fa /other/sdl/sdl.lua | |
| parent | 206e9adb9140c3c8963661f534703de33f8abe05 (diff) | |
| parent | 44a47d4253a829abcf50dac5586fd9a351f0c66b (diff) | |
| download | zcatch-fc99167e687ba688ce9306bbec7e801450c917be.tar.gz zcatch-fc99167e687ba688ce9306bbec7e801450c917be.zip | |
Merge branch 'master' into zCatch-Exp
Conflicts: src/engine/server.h src/engine/server/server.cpp src/engine/server/server.h src/engine/shared/network.h src/engine/shared/network_server.cpp src/game/server/player.h
Diffstat (limited to 'other/sdl/sdl.lua')
| -rw-r--r-- | other/sdl/sdl.lua | 20 |
1 files changed, 14 insertions, 6 deletions
diff --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 |