diff --git a/opengl-test-two/bin/Debug/opengl-test-two b/opengl-test-two/bin/Debug/opengl-test-two new file mode 100755 index 0000000..026dd6a Binary files /dev/null and b/opengl-test-two/bin/Debug/opengl-test-two differ diff --git a/opengl-test-two/lib/libGLEW.a b/opengl-test-two/lib/libGLEW.a new file mode 100644 index 0000000..5ca7a8f Binary files /dev/null and b/opengl-test-two/lib/libGLEW.a differ diff --git a/opengl-test-two/lib/libSDL2.a b/opengl-test-two/lib/libSDL2.a index 5e6f56c..8710941 100644 Binary files a/opengl-test-two/lib/libSDL2.a and b/opengl-test-two/lib/libSDL2.a differ diff --git a/opengl-test-two/lib/libSDL2_image.a b/opengl-test-two/lib/libSDL2_image.a index f3b2b9d..0d464dd 100644 Binary files a/opengl-test-two/lib/libSDL2_image.a and b/opengl-test-two/lib/libSDL2_image.a differ diff --git a/opengl-test-two/lib/libSDL2main.a b/opengl-test-two/lib/libSDL2main.a index 2a77bf1..2a22e13 100644 Binary files a/opengl-test-two/lib/libSDL2main.a and b/opengl-test-two/lib/libSDL2main.a differ diff --git a/opengl-test-two/lib/libglfw3.a b/opengl-test-two/lib/libglfw3.a index 7736ad0..ff0df0a 100644 Binary files a/opengl-test-two/lib/libglfw3.a and b/opengl-test-two/lib/libglfw3.a differ diff --git a/opengl-test-two/lib/libiconv.rb b/opengl-test-two/lib/libiconv.rb new file mode 100644 index 0000000..d621b1e --- /dev/null +++ b/opengl-test-two/lib/libiconv.rb @@ -0,0 +1,56 @@ +class Libiconv < Formula + desc "Conversion library" + homepage "https://www.gnu.org/software/libiconv/" + url "https://ftpmirror.gnu.org/libiconv/libiconv-1.14.tar.gz" + mirror "https://ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz" + sha256 "72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613" + + bottle do + sha256 "64d8a9383ba42ba3e41422bb8548ebc8f296f67fdda6e6d6a324f990b03c6db0" => :el_capitan + sha256 "a0d9ff36269bc908fde4a039d2083152202055a2e053b6582ad2c9063c85ebc2" => :yosemite + sha256 "456a816a94427c963fa3cb90257830aa33268f22443cf5a8a4cf1be3e3ed3bb9" => :mavericks + end + + keg_only :provided_by_osx + + option :universal + + patch do + url "https://raw.githubusercontent.com/Homebrew/patches/9be2793af/libiconv/patch-Makefile.devel" + sha256 "ad9b6da1a82fc4de27d6f7086a3382993a0b16153bc8e8a23d7b5f9334ca0a42" + end + + patch do + url "https://raw.githubusercontent.com/Homebrew/patches/9be2793af/libiconv/patch-utf8mac.diff" + sha256 "e8128732f22f63b5c656659786d2cf76f1450008f36bcf541285268c66cabeab" + end + + patch :DATA + + def install + ENV.universal_binary if build.universal? + ENV.j1 + + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--prefix=#{prefix}", + "--enable-extra-encodings" + system "make", "-f", "Makefile.devel", "CFLAGS=#{ENV.cflags}", "CC=#{ENV.cc}" + system "make", "install" + end +end + + +__END__ +diff --git a/lib/flags.h b/lib/flags.h +index d7cda21..4cabcac 100644 +--- a/lib/flags.h ++++ b/lib/flags.h +@@ -14,6 +14,7 @@ + + #define ei_ascii_oflags (0) + #define ei_utf8_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) ++#define ei_utf8mac_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) + #define ei_ucs2_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) + #define ei_ucs2be_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) + #define ei_ucs2le_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) diff --git a/opengl-test-two/opengl-test-two.cbp b/opengl-test-two/opengl-test-two.cbp index 10a334b..6b3acd4 100644 --- a/opengl-test-two/opengl-test-two.cbp +++ b/opengl-test-two/opengl-test-two.cbp @@ -34,11 +34,9 @@ + - - - diff --git a/opengl-test-two/opengl-test-two.depend b/opengl-test-two/opengl-test-two.depend index ca453c2..c3061fa 100644 --- a/opengl-test-two/opengl-test-two.depend +++ b/opengl-test-two/opengl-test-two.depend @@ -368,3 +368,369 @@ +1473323187 source:/Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/main.cpp + + + + + + + + + + +1473057771 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/GL/glew.h + + + + + + + + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/GLFW/glfw3.h + + + + + + + + + + + + + + + + + + + + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL.h + "SDL_main.h" + "SDL_stdinc.h" + "SDL_assert.h" + "SDL_atomic.h" + "SDL_audio.h" + "SDL_clipboard.h" + "SDL_cpuinfo.h" + "SDL_endian.h" + "SDL_error.h" + "SDL_events.h" + "SDL_filesystem.h" + "SDL_joystick.h" + "SDL_gamecontroller.h" + "SDL_haptic.h" + "SDL_hints.h" + "SDL_loadso.h" + "SDL_log.h" + "SDL_messagebox.h" + "SDL_mutex.h" + "SDL_power.h" + "SDL_render.h" + "SDL_rwops.h" + "SDL_system.h" + "SDL_thread.h" + "SDL_timer.h" + "SDL_version.h" + "SDL_video.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_main.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_stdinc.h + "SDL_config.h" + + + + + + + + + + + + + + + + + + + + "begin_code.h" + + + + + + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_config.h + "SDL_platform.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_platform.h + "AvailabilityMacros.h" + "TargetConditionals.h" + + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/begin_code.h + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/close_code.h + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_assert.h + "SDL_config.h" + "begin_code.h" + + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_atomic.h + "SDL_stdinc.h" + "SDL_platform.h" + "begin_code.h" + + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_audio.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_endian.h" + "SDL_mutex.h" + "SDL_thread.h" + "SDL_rwops.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_error.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_endian.h + "SDL_stdinc.h" + + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_mutex.h + "SDL_stdinc.h" + "SDL_error.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_thread.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_atomic.h" + "SDL_mutex.h" + "begin_code.h" + + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_rwops.h + "SDL_stdinc.h" + "SDL_error.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_clipboard.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_cpuinfo.h + "SDL_stdinc.h" + + + + + + + + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_events.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_video.h" + "SDL_keyboard.h" + "SDL_mouse.h" + "SDL_joystick.h" + "SDL_gamecontroller.h" + "SDL_quit.h" + "SDL_gesture.h" + "SDL_touch.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_video.h + "SDL_stdinc.h" + "SDL_pixels.h" + "SDL_rect.h" + "SDL_surface.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_pixels.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_rect.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_pixels.h" + "SDL_rwops.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_surface.h + "SDL_stdinc.h" + "SDL_pixels.h" + "SDL_rect.h" + "SDL_blendmode.h" + "SDL_rwops.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_blendmode.h + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_keyboard.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_keycode.h" + "SDL_video.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_keycode.h + "SDL_stdinc.h" + "SDL_scancode.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_scancode.h + "SDL_stdinc.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_mouse.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_video.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_joystick.h + "SDL_stdinc.h" + "SDL_error.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_gamecontroller.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_rwops.h" + "SDL_joystick.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_quit.h + "SDL_stdinc.h" + "SDL_error.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_gesture.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_video.h" + "SDL_touch.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_touch.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_video.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_filesystem.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_haptic.h + "SDL_stdinc.h" + "SDL_error.h" + "SDL_joystick.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_hints.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_loadso.h + "SDL_stdinc.h" + "SDL_error.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_log.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_messagebox.h + "SDL_stdinc.h" + "SDL_video.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_power.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_render.h + "SDL_stdinc.h" + "SDL_rect.h" + "SDL_video.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_system.h + "SDL_stdinc.h" + "SDL_keyboard.h" + "SDL_render.h" + "SDL_video.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_timer.h + "SDL_stdinc.h" + "SDL_error.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_version.h + "SDL_stdinc.h" + "begin_code.h" + "close_code.h" + +1472735445 /Users/leanderschmedemann/programming/imanox/imanox-chroma-matting/opengl-test-two/include/SDL2/SDL_image.h + "SDL.h" + "SDL_version.h" + "begin_code.h" + "close_code.h" + diff --git a/opengl-test-two/project_settings_changes.txt b/opengl-test-two/project_settings_changes.txt new file mode 100644 index 0000000..bb6cddb --- /dev/null +++ b/opengl-test-two/project_settings_changes.txt @@ -0,0 +1,2 @@ +glew32 -> GLEW +