made sdl like a little bampack

49 files changed, 76 insertions, 0 deletions

diff --git a/other/sdl_include/SDL.h b/other/sdl/include/SDL.h
index 60ac26ce..60ac26ce 100644
--- a/other/sdl_include/SDL.h
+++ b/other/sdl/include/SDL.h
diff --git a/other/sdl_include/SDL_active.h b/other/sdl/include/SDL_active.h
index 2cf474c5..2cf474c5 100644
--- a/other/sdl_include/SDL_active.h
+++ b/other/sdl/include/SDL_active.h
diff --git a/other/sdl_include/SDL_audio.h b/other/sdl/include/SDL_audio.h
index 68ec4759..68ec4759 100644
--- a/other/sdl_include/SDL_audio.h
+++ b/other/sdl/include/SDL_audio.h
diff --git a/other/sdl_include/SDL_byteorder.h b/other/sdl/include/SDL_byteorder.h
index 3871cfed..3871cfed 100644
--- a/other/sdl_include/SDL_byteorder.h
+++ b/other/sdl/include/SDL_byteorder.h
diff --git a/other/sdl_include/SDL_cdrom.h b/other/sdl/include/SDL_cdrom.h
index 5f8f0c62..5f8f0c62 100644
--- a/other/sdl_include/SDL_cdrom.h
+++ b/other/sdl/include/SDL_cdrom.h
diff --git a/other/sdl_include/SDL_config.h b/other/sdl/include/SDL_config.h
index c82f42ad..c82f42ad 100644
--- a/other/sdl_include/SDL_config.h
+++ b/other/sdl/include/SDL_config.h
diff --git a/other/sdl_include/SDL_config.h.default b/other/sdl/include/SDL_config.h.default
index c82f42ad..c82f42ad 100644
--- a/other/sdl_include/SDL_config.h.default
+++ b/other/sdl/include/SDL_config.h.default
diff --git a/other/sdl_include/SDL_config.h.in b/other/sdl/include/SDL_config.h.in
index 13a3f9a0..13a3f9a0 100644
--- a/other/sdl_include/SDL_config.h.in
+++ b/other/sdl/include/SDL_config.h.in
diff --git a/other/sdl_include/SDL_config_amiga.h b/other/sdl/include/SDL_config_amiga.h
index 23e08619..23e08619 100644
--- a/other/sdl_include/SDL_config_amiga.h
+++ b/other/sdl/include/SDL_config_amiga.h
diff --git a/other/sdl_include/SDL_config_dreamcast.h b/other/sdl/include/SDL_config_dreamcast.h
index 9cbeea31..9cbeea31 100644
--- a/other/sdl_include/SDL_config_dreamcast.h
+++ b/other/sdl/include/SDL_config_dreamcast.h
diff --git a/other/sdl_include/SDL_config_macos.h b/other/sdl/include/SDL_config_macos.h
index c4a1c598..c4a1c598 100644
--- a/other/sdl_include/SDL_config_macos.h
+++ b/other/sdl/include/SDL_config_macos.h
diff --git a/other/sdl_include/SDL_config_macosx.h b/other/sdl/include/SDL_config_macosx.h
index 481c22ed..481c22ed 100644
--- a/other/sdl_include/SDL_config_macosx.h
+++ b/other/sdl/include/SDL_config_macosx.h
diff --git a/other/sdl_include/SDL_config_minimal.h b/other/sdl/include/SDL_config_minimal.h
index 78b6148c..78b6148c 100644
--- a/other/sdl_include/SDL_config_minimal.h
+++ b/other/sdl/include/SDL_config_minimal.h
diff --git a/other/sdl_include/SDL_config_nds.h b/other/sdl/include/SDL_config_nds.h
index 20b789c8..20b789c8 100644
--- a/other/sdl_include/SDL_config_nds.h
+++ b/other/sdl/include/SDL_config_nds.h
diff --git a/other/sdl_include/SDL_config_os2.h b/other/sdl/include/SDL_config_os2.h
index 8cdea9ff..8cdea9ff 100644
--- a/other/sdl_include/SDL_config_os2.h
+++ b/other/sdl/include/SDL_config_os2.h
diff --git a/other/sdl_include/SDL_config_symbian.h b/other/sdl/include/SDL_config_symbian.h
index 607c37a4..607c37a4 100644
--- a/other/sdl_include/SDL_config_symbian.h
+++ b/other/sdl/include/SDL_config_symbian.h
diff --git a/other/sdl_include/SDL_config_win32.h b/other/sdl/include/SDL_config_win32.h
index cfb44d2a..cfb44d2a 100644
--- a/other/sdl_include/SDL_config_win32.h
+++ b/other/sdl/include/SDL_config_win32.h
diff --git a/other/sdl_include/SDL_copying.h b/other/sdl/include/SDL_copying.h
index 39e122db..39e122db 100644
--- a/other/sdl_include/SDL_copying.h
+++ b/other/sdl/include/SDL_copying.h
diff --git a/other/sdl_include/SDL_cpuinfo.h b/other/sdl/include/SDL_cpuinfo.h
index 72acbdd8..72acbdd8 100644
--- a/other/sdl_include/SDL_cpuinfo.h
+++ b/other/sdl/include/SDL_cpuinfo.h
diff --git a/other/sdl_include/SDL_endian.h b/other/sdl/include/SDL_endian.h
index 8f8db4cc..8f8db4cc 100644
--- a/other/sdl_include/SDL_endian.h
+++ b/other/sdl/include/SDL_endian.h
diff --git a/other/sdl_include/SDL_error.h b/other/sdl/include/SDL_error.h
index 26d6bfae..26d6bfae 100644
--- a/other/sdl_include/SDL_error.h
+++ b/other/sdl/include/SDL_error.h
diff --git a/other/sdl_include/SDL_events.h b/other/sdl/include/SDL_events.h
index 9fe918c7..9fe918c7 100644
--- a/other/sdl_include/SDL_events.h
+++ b/other/sdl/include/SDL_events.h
diff --git a/other/sdl_include/SDL_getenv.h b/other/sdl/include/SDL_getenv.h
index 853b9ce4..853b9ce4 100644
--- a/other/sdl_include/SDL_getenv.h
+++ b/other/sdl/include/SDL_getenv.h
diff --git a/other/sdl_include/SDL_joystick.h b/other/sdl/include/SDL_joystick.h
index e4f72f1a..e4f72f1a 100644
--- a/other/sdl_include/SDL_joystick.h
+++ b/other/sdl/include/SDL_joystick.h
diff --git a/other/sdl_include/SDL_keyboard.h b/other/sdl/include/SDL_keyboard.h
index 1ad7dcaa..1ad7dcaa 100644
--- a/other/sdl_include/SDL_keyboard.h
+++ b/other/sdl/include/SDL_keyboard.h
diff --git a/other/sdl_include/SDL_keysym.h b/other/sdl/include/SDL_keysym.h
index ff44a035..ff44a035 100644
--- a/other/sdl_include/SDL_keysym.h
+++ b/other/sdl/include/SDL_keysym.h
diff --git a/other/sdl_include/SDL_loadso.h b/other/sdl/include/SDL_loadso.h
index ce964494..ce964494 100644
--- a/other/sdl_include/SDL_loadso.h
+++ b/other/sdl/include/SDL_loadso.h
diff --git a/other/sdl_include/SDL_main.h b/other/sdl/include/SDL_main.h
index cf8b728d..cf8b728d 100644
--- a/other/sdl_include/SDL_main.h
+++ b/other/sdl/include/SDL_main.h
diff --git a/other/sdl_include/SDL_mouse.h b/other/sdl/include/SDL_mouse.h
index 019497fb..019497fb 100644
--- a/other/sdl_include/SDL_mouse.h
+++ b/other/sdl/include/SDL_mouse.h
diff --git a/other/sdl_include/SDL_mutex.h b/other/sdl/include/SDL_mutex.h
index 00165281..00165281 100644
--- a/other/sdl_include/SDL_mutex.h
+++ b/other/sdl/include/SDL_mutex.h
diff --git a/other/sdl_include/SDL_name.h b/other/sdl/include/SDL_name.h
index 511619af..511619af 100644
--- a/other/sdl_include/SDL_name.h
+++ b/other/sdl/include/SDL_name.h
diff --git a/other/sdl_include/SDL_opengl.h b/other/sdl/include/SDL_opengl.h
index 36c0a309..36c0a309 100644
--- a/other/sdl_include/SDL_opengl.h
+++ b/other/sdl/include/SDL_opengl.h
diff --git a/other/sdl_include/SDL_platform.h b/other/sdl/include/SDL_platform.h
index 1bfee29e..1bfee29e 100644
--- a/other/sdl_include/SDL_platform.h
+++ b/other/sdl/include/SDL_platform.h
diff --git a/other/sdl_include/SDL_quit.h b/other/sdl/include/SDL_quit.h
index fcf40fbd..fcf40fbd 100644
--- a/other/sdl_include/SDL_quit.h
+++ b/other/sdl/include/SDL_quit.h
diff --git a/other/sdl_include/SDL_rwops.h b/other/sdl/include/SDL_rwops.h
index 8c177017..8c177017 100644
--- a/other/sdl_include/SDL_rwops.h
+++ b/other/sdl/include/SDL_rwops.h
diff --git a/other/sdl_include/SDL_stdinc.h b/other/sdl/include/SDL_stdinc.h
index e47c21da..e47c21da 100644
--- a/other/sdl_include/SDL_stdinc.h
+++ b/other/sdl/include/SDL_stdinc.h
diff --git a/other/sdl_include/SDL_syswm.h b/other/sdl/include/SDL_syswm.h
index 010dd1bc..010dd1bc 100644
--- a/other/sdl_include/SDL_syswm.h
+++ b/other/sdl/include/SDL_syswm.h
diff --git a/other/sdl_include/SDL_thread.h b/other/sdl/include/SDL_thread.h
index 403ee462..403ee462 100644
--- a/other/sdl_include/SDL_thread.h
+++ b/other/sdl/include/SDL_thread.h
diff --git a/other/sdl_include/SDL_timer.h b/other/sdl/include/SDL_timer.h
index d21159fe..d21159fe 100644
--- a/other/sdl_include/SDL_timer.h
+++ b/other/sdl/include/SDL_timer.h
diff --git a/other/sdl_include/SDL_types.h b/other/sdl/include/SDL_types.h
index 853b9ce4..853b9ce4 100644
--- a/other/sdl_include/SDL_types.h
+++ b/other/sdl/include/SDL_types.h
diff --git a/other/sdl_include/SDL_version.h b/other/sdl/include/SDL_version.h
index 9ff0fa8a..9ff0fa8a 100644
--- a/other/sdl_include/SDL_version.h
+++ b/other/sdl/include/SDL_version.h
diff --git a/other/sdl_include/SDL_video.h b/other/sdl/include/SDL_video.h
index f6baccee..f6baccee 100644
--- a/other/sdl_include/SDL_video.h
+++ b/other/sdl/include/SDL_video.h
diff --git a/other/sdl_include/begin_code.h b/other/sdl/include/begin_code.h
index d1ddaa6a..d1ddaa6a 100644
--- a/other/sdl_include/begin_code.h
+++ b/other/sdl/include/begin_code.h
diff --git a/other/sdl_include/close_code.h b/other/sdl/include/close_code.h
index afbb6504..afbb6504 100644
--- a/other/sdl_include/close_code.h
+++ b/other/sdl/include/close_code.h
diff --git a/other/sdl/sdl.bam b/other/sdl/sdl.bam
new file mode 100644
index 00000000..d7135e7c
--- /dev/null
+++ b/other/sdl/sdl.bam
@@ -0,0 +1,76 @@
+SDL = {
+	basepath = PathPath(_REQUIREDNAME),
+
+	OptFind = function (name, required)
+		local check = function(option)
+			option.value = nil
+			option.use_sdlconfig = nil
+			option.use_win32sdl = nil
+			option.use_osxframework = nil
+			option.lib_path = nil
+			
+			if ExecuteSilent("sdl-config") > 0 and ExecuteSilent("sdl-config --cflags") == 0 then
+				option.value = 1
+				option.use_sdlconfig = 1
+			end
+			
+			if platform == "win32" then
+				option.value = 1
+				option.use_win32sdl = 1
+			end
+			
+			if platform == "macosx" then
+				option.value = 1
+				option.use_osxframework = 1
+			end
+		end
+		
+		local apply = function(option, settings)
+			if option.use_sdlconfig then
+				settings.cc.flags = settings.cc.flags .. " -I/usr/include/SDL "
+				settings.linker.flags = settings.linker.flags .. " `sdl-config --libs` "
+			end
+
+			if option.use_osxframework then
+				client_settings.linker.frameworks:add("SDL")
+				client_settings.cc.includes:add("/Library/Frameworks/SDL.framework/Headers")
+			end
+
+			if option.use_win32sdl then
+				settings.cc.includes:add(SDL.basepath .. "/include")
+				settings.linker.libpath:add(SDL.basepath .. "/vc2005libs")
+				settings.linker.libs:add("SDL")
+				settings.linker.libs:add("SDLmain")
+			end
+		end
+		
+		local save = function(option, output)
+			output:option(option, "value")
+			output:option(option, "use_sdlconfig")
+			output:option(option, "use_win32sdl")
+			output:option(option, "use_osxframework")
+		end
+		
+		local display = function(option)
+			if option.value then
+				if option.use_sdlconfig then return "using sdl-config" end
+				if option.use_win32sdl then return "using supplied win32 libraries" end
+				if option.use_osxframework then return "using osx framework" end
+				return "using unknown method"
+			else
+				if option.required then
+					return "not found (required)"
+				else
+					return "not found (optional)"
+				end
+			end
+		end
+		
+		local o = MakeOption(name, 0, check, save, display)
+		o.apply = apply
+		o.include_path = nil
+		o.lib_path = nil
+		o.required = required
+		return o
+	end
+}
diff --git a/other/sdlnotes.txt b/other/sdl/sdlnotes.txt
index eb654d3a..eb654d3a 100644
--- a/other/sdlnotes.txt
+++ b/other/sdl/sdlnotes.txt
diff --git a/other/vc2005_sdllibs/SDL.dll b/other/sdl/vc2005libs/SDL.dll
index 3ce97a59..3ce97a59 100644
--- a/other/vc2005_sdllibs/SDL.dll
+++ b/other/sdl/vc2005libs/SDL.dll
Binary files differdiff --git a/other/vc2005_sdllibs/SDL.lib b/other/sdl/vc2005libs/SDL.lib
index 993fd2ba..993fd2ba 100644
--- a/other/vc2005_sdllibs/SDL.lib
+++ b/other/sdl/vc2005libs/SDL.lib
Binary files differdiff --git a/other/vc2005_sdllibs/SDLmain.lib b/other/sdl/vc2005libs/SDLmain.lib
index 13bf9f97..13bf9f97 100644
--- a/other/vc2005_sdllibs/SDLmain.lib
+++ b/other/sdl/vc2005libs/SDLmain.lib
Binary files differ