updated xcode

updated projects
updated Android

.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: d8a8f01314f75bdaea8e53f7310af67592cd9f4a
+node: 16d738a2ec3040e2c1dcfa788c7439688936633a
 branch: default
 latesttag: null
-latesttagdistance: 195
+latesttagdistance: 212

Android.mk

@@ -27,11 +27,6 @@ LOCAL_SRC_FILES := \
 				$(subst $(LOCAL_PATH)/,, \
 				$(wildcard $(OXYGINE_SRC)/closure/*.cpp) \
 				$(wildcard $(OXYGINE_SRC)/core/*.cpp) \
-				$(OXYGINE_SRC)/core/gl/NativeTextureGLES.cpp \
-				$(OXYGINE_SRC)/core/gl/oxgl.cpp \
-				$(OXYGINE_SRC)/core/gl/VertexDeclarationGL.cpp \
-				$(OXYGINE_SRC)/core/gl/VideoDriverGL.cpp \
-				$(OXYGINE_SRC)/core/gl/VideoDriverGLES20.cpp \
 				$(wildcard $(OXYGINE_SRC)/math/*.cpp) \
 				$(wildcard $(OXYGINE_SRC)/pugixml/*.cpp) \
 				$(wildcard $(OXYGINE_SRC)/res/*.cpp) \
@@ -44,6 +39,13 @@ LOCAL_SRC_FILES := \
 				$(wildcard $(OXYGINE_SRC)/../greenlets/src/*.c) \
 				)
 
+LOCAL_SRC_FILES += \
+				$(OXYGINE_SRC)/core/gl/NativeTextureGLES.cpp \
+				$(OXYGINE_SRC)/core/gl/oxgl.cpp \
+				$(OXYGINE_SRC)/core/gl/VertexDeclarationGL.cpp \
+				$(OXYGINE_SRC)/core/gl/VideoDriverGL.cpp \
+				$(OXYGINE_SRC)/core/gl/VideoDriverGLES20.cpp \
+
 SDL_PATH := $(LOCAL_PATH)/../SDL/include/
 THIRD_PARTY := $(LOCAL_PATH)/oxygine/third_party/android/
 
@@ -53,9 +55,10 @@ LOCAL_C_INCLUDES := $(OXYGINE_SRC)/ \
 					$(THIRD_PARTY)/libjpeg/ \
 					$(THIRD_PARTY)/libpng/
 
+LOCAL_C_FLAGS := -DUSE_FILE32API
+LOCAL_EXPORT_C_FLAGS := $(LOCAL_C_FLAGS)
 LOCAL_EXPORT_LDLIBS += -lGLESv2 -llog -lz
 LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
-LOCAL_EXPORT_CFLAGS += $(LOCAL_CFLAGS)
 LOCAL_WHOLE_STATIC_LIBRARIES := ox_libpng_static ox_libjpeg_static
 					
 include $(BUILD_STATIC_LIBRARY)

examples/Demo/ios/OxygineDemo/OxygineDemo.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		048B7AAD17FDEC3D00AE2D0B /* shader.glsl in Resources */ = {isa = PBXBuildFile; fileRef = 048B7AAC17FDEC3D00AE2D0B /* shader.glsl */; };
 		04998CFA17F8A933003441C3 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 04998CF817F8A933003441C3 /* InfoPlist.strings */; };
 		04998D2B17F8A94F003441C3 /* demo in Resources */ = {isa = PBXBuildFile; fileRef = 04998D2717F8A94F003441C3 /* demo */; };
 		04998D2C17F8A94F003441C3 /* ext in Resources */ = {isa = PBXBuildFile; fileRef = 04998D2817F8A94F003441C3 /* ext */; };
@@ -68,6 +69,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		048B7AAC17FDEC3D00AE2D0B /* shader.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = shader.glsl; path = "/Users/Mac/dev/oxygine-framework/oxygine/SDL/oxygine_xcode/oxygine/../../../system_data/original/system/shader.glsl"; sourceTree = "<absolute>"; };
 		04998CEC17F8A933003441C3 /* OxygineDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OxygineDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		04998CF717F8A933003441C3 /* OxygineDemo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OxygineDemo-Info.plist"; sourceTree = "<group>"; };
 		04998CF917F8A933003441C3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -197,6 +199,7 @@
 		04998CF617F8A933003441C3 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				048B7AAC17FDEC3D00AE2D0B /* shader.glsl */,
 				04998D2717F8A94F003441C3 /* demo */,
 				04998D2817F8A94F003441C3 /* ext */,
 				04998D2917F8A94F003441C3 /* images */,
@@ -358,6 +361,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				048B7AAD17FDEC3D00AE2D0B /* shader.glsl in Resources */,
 				04998D2E17F8A94F003441C3 /* xmls in Resources */,
 				04998D2C17F8A94F003441C3 /* ext in Resources */,
 				04998D2B17F8A94F003441C3 /* demo in Resources */,
@@ -510,6 +514,8 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "OxygineDemo/OxygineDemo-Prefix.pch";
+				GCC_WARN_UNUSED_VALUE = YES;
+				GCC_WARN_UNUSED_VARIABLE = NO;
 				INFOPLIST_FILE = "OxygineDemo/OxygineDemo-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -531,6 +537,8 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "OxygineDemo/OxygineDemo-Prefix.pch";
+				GCC_WARN_UNUSED_VALUE = YES;
+				GCC_WARN_UNUSED_VARIABLE = NO;
 				INFOPLIST_FILE = "OxygineDemo/OxygineDemo-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",

examples/Demo/ios/demo/demo.xcodeproj/project.pbxproj

@@ -1,682 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		C313FF4517C0A32E00A2ABDA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C313FF4417C0A32E00A2ABDA /* UIKit.framework */; };
-		C313FF4717C0A32E00A2ABDA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C313FF4617C0A32E00A2ABDA /* Foundation.framework */; };
-		C313FF4917C0A32E00A2ABDA /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C313FF4817C0A32E00A2ABDA /* CoreGraphics.framework */; };
-		C313FF4F17C0A32E00A2ABDA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = C313FF4D17C0A32E00A2ABDA /* InfoPlist.strings */; };
-		C313FF5717C0A32E00A2ABDA /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = C313FF5617C0A32E00A2ABDA /* Default.png */; };
-		C313FF5917C0A32E00A2ABDA /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C313FF5817C0A32E00A2ABDA /* [email protected] */; };
-		C313FF5B17C0A32E00A2ABDA /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C313FF5A17C0A32E00A2ABDA /* [email protected] */; };
-		C313FFE317C0ABA600A2ABDA /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C313FFE217C0ABA600A2ABDA /* OpenGLES.framework */; };
-		C313FFE517C0ABB100A2ABDA /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C313FFE417C0ABB100A2ABDA /* CoreAudio.framework */; };
-		C313FFE917C0AE9100A2ABDA /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C313FFE817C0AE9100A2ABDA /* AudioToolbox.framework */; };
-		C313FFEB17C0AEC700A2ABDA /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C313FFEA17C0AEC700A2ABDA /* libSDL2.a */; };
-		C3324AAD17C0B59B00897F24 /* liboxygine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C30E413917C0B523002956CB /* liboxygine.a */; };
-		C3324AB017C0B5FA00897F24 /* libjpeg_ios_simulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3324AAE17C0B5FA00897F24 /* libjpeg_ios_simulator.a */; };
-		C3324AB117C0B5FA00897F24 /* libpng_ios_sumulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3324AAF17C0B5FA00897F24 /* libpng_ios_sumulator.a */; };
-		C3324AB317C0B62000897F24 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = C3324AB217C0B62000897F24 /* libz.dylib */; };
-		C3324B1F17C0B77600897F24 /* ext in Resources */ = {isa = PBXBuildFile; fileRef = C3324B1A17C0B77600897F24 /* ext */; };
-		C3324B2017C0B77600897F24 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = C3324B1B17C0B77600897F24 /* fonts */; };
-		C3324B2117C0B77600897F24 /* images in Resources */ = {isa = PBXBuildFile; fileRef = C3324B1C17C0B77600897F24 /* images */; };
-		C3324B2217C0B77600897F24 /* system in Resources */ = {isa = PBXBuildFile; fileRef = C3324B1D17C0B77600897F24 /* system */; };
-		C3324B2317C0B77600897F24 /* xmls in Resources */ = {isa = PBXBuildFile; fileRef = C3324B1E17C0B77600897F24 /* xmls */; };
-		C387047F17C0C19D00015CA8 /* testgles.c_ in Sources */ = {isa = PBXBuildFile; fileRef = C387047E17C0C19D00015CA8 /* testgles.c_ */; };
-		C387049017C0C33300015CA8 /* SDL_test_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048117C0C33300015CA8 /* SDL_test_assert.c */; };
-		C387049117C0C33300015CA8 /* SDL_test_common.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048217C0C33300015CA8 /* SDL_test_common.c */; };
-		C387049217C0C33300015CA8 /* SDL_test_compare.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048317C0C33300015CA8 /* SDL_test_compare.c */; };
-		C387049317C0C33300015CA8 /* SDL_test_crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048417C0C33300015CA8 /* SDL_test_crc32.c */; };
-		C387049417C0C33300015CA8 /* SDL_test_font.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048517C0C33300015CA8 /* SDL_test_font.c */; };
-		C387049517C0C33300015CA8 /* SDL_test_fuzzer.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048617C0C33300015CA8 /* SDL_test_fuzzer.c */; };
-		C387049617C0C33300015CA8 /* SDL_test_harness.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048717C0C33300015CA8 /* SDL_test_harness.c */; };
-		C387049717C0C33300015CA8 /* SDL_test_imageBlit.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048817C0C33300015CA8 /* SDL_test_imageBlit.c */; };
-		C387049817C0C33300015CA8 /* SDL_test_imageBlitBlend.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048917C0C33300015CA8 /* SDL_test_imageBlitBlend.c */; };
-		C387049917C0C33300015CA8 /* SDL_test_imageFace.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048A17C0C33300015CA8 /* SDL_test_imageFace.c */; };
-		C387049A17C0C33300015CA8 /* SDL_test_imagePrimitives.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048B17C0C33300015CA8 /* SDL_test_imagePrimitives.c */; };
-		C387049B17C0C33300015CA8 /* SDL_test_imagePrimitivesBlend.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048C17C0C33300015CA8 /* SDL_test_imagePrimitivesBlend.c */; };
-		C387049C17C0C33300015CA8 /* SDL_test_log.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048D17C0C33300015CA8 /* SDL_test_log.c */; };
-		C387049D17C0C33300015CA8 /* SDL_test_md5.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048E17C0C33300015CA8 /* SDL_test_md5.c */; };
-		C387049E17C0C33300015CA8 /* SDL_test_random.c in Sources */ = {isa = PBXBuildFile; fileRef = C387048F17C0C33300015CA8 /* SDL_test_random.c */; };
-		C3B3181117C0B06F00903C9D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B3181017C0B06F00903C9D /* QuartzCore.framework */; };
-		C3B3182717C0B12000903C9D /* entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3B3181417C0B12000903C9D /* entry_point.cpp */; };
-		C3B3182817C0B12000903C9D /* example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3B3181517C0B12000903C9D /* example.cpp */; };
-		C3B3182917C0B12000903C9D /* test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3B3181717C0B12000903C9D /* test.cpp */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		C30E413817C0B523002956CB /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = C30E413417C0B523002956CB /* oxygine.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = C3E86F4C16EBC8A500052915;
-			remoteInfo = oxygine;
-		};
-		C3324AAB17C0B56E00897F24 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = C30E413417C0B523002956CB /* oxygine.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = C3E86F4B16EBC8A500052915;
-			remoteInfo = oxygine;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		C30E413417C0B523002956CB /* oxygine.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine.xcodeproj; path = ../../../../../oxygine/SDL/oxygine_xcode/oxygine/oxygine.xcodeproj; sourceTree = "<group>"; };
-		C313FF4017C0A32E00A2ABDA /* demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		C313FF4417C0A32E00A2ABDA /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		C313FF4617C0A32E00A2ABDA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		C313FF4817C0A32E00A2ABDA /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		C313FF4C17C0A32E00A2ABDA /* demo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "demo-Info.plist"; sourceTree = "<group>"; };
-		C313FF4E17C0A32E00A2ABDA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		C313FF5217C0A32E00A2ABDA /* demo-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "demo-Prefix.pch"; sourceTree = "<group>"; };
-		C313FF5617C0A32E00A2ABDA /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
-		C313FF5817C0A32E00A2ABDA /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
-		C313FF5A17C0A32E00A2ABDA /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
-		C313FF7D17C0A97900A2ABDA /* begin_code.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = begin_code.h; path = ../../../../../../SDL/include/begin_code.h; sourceTree = "<group>"; };
-		C313FF7E17C0A97900A2ABDA /* close_code.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = close_code.h; path = ../../../../../../SDL/include/close_code.h; sourceTree = "<group>"; };
-		C313FF7F17C0A97900A2ABDA /* doxyfile */ = {isa = PBXFileReference; lastKnownFileType = text; name = doxyfile; path = ../../../../../../SDL/include/doxyfile; sourceTree = "<group>"; };
-		C313FF8017C0A97900A2ABDA /* SDL_assert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_assert.h; path = ../../../../../../SDL/include/SDL_assert.h; sourceTree = "<group>"; };
-		C313FF8117C0A97900A2ABDA /* SDL_atomic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_atomic.h; path = ../../../../../../SDL/include/SDL_atomic.h; sourceTree = "<group>"; };
-		C313FF8217C0A97900A2ABDA /* SDL_audio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_audio.h; path = ../../../../../../SDL/include/SDL_audio.h; sourceTree = "<group>"; };
-		C313FF8317C0A97900A2ABDA /* SDL_bits.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_bits.h; path = ../../../../../../SDL/include/SDL_bits.h; sourceTree = "<group>"; };
-		C313FF8417C0A97900A2ABDA /* SDL_blendmode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_blendmode.h; path = ../../../../../../SDL/include/SDL_blendmode.h; sourceTree = "<group>"; };
-		C313FF8517C0A97900A2ABDA /* SDL_clipboard.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_clipboard.h; path = ../../../../../../SDL/include/SDL_clipboard.h; sourceTree = "<group>"; };
-		C313FF8617C0A97900A2ABDA /* SDL_config_android.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_config_android.h; path = ../../../../../../SDL/include/SDL_config_android.h; sourceTree = "<group>"; };
-		C313FF8717C0A97900A2ABDA /* SDL_config_iphoneos.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_config_iphoneos.h; path = ../../../../../../SDL/include/SDL_config_iphoneos.h; sourceTree = "<group>"; };
-		C313FF8817C0A97900A2ABDA /* SDL_config_macosx.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_config_macosx.h; path = ../../../../../../SDL/include/SDL_config_macosx.h; sourceTree = "<group>"; };
-		C313FF8917C0A97900A2ABDA /* SDL_config_minimal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_config_minimal.h; path = ../../../../../../SDL/include/SDL_config_minimal.h; sourceTree = "<group>"; };
-		C313FF8A17C0A97900A2ABDA /* SDL_config_pandora.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_config_pandora.h; path = ../../../../../../SDL/include/SDL_config_pandora.h; sourceTree = "<group>"; };
-		C313FF8B17C0A97900A2ABDA /* SDL_config_psp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_config_psp.h; path = ../../../../../../SDL/include/SDL_config_psp.h; sourceTree = "<group>"; };
-		C313FF8C17C0A97900A2ABDA /* SDL_config_windows.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_config_windows.h; path = ../../../../../../SDL/include/SDL_config_windows.h; sourceTree = "<group>"; };
-		C313FF8D17C0A97900A2ABDA /* SDL_config_wiz.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_config_wiz.h; path = ../../../../../../SDL/include/SDL_config_wiz.h; sourceTree = "<group>"; };
-		C313FF8E17C0A97900A2ABDA /* SDL_config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_config.h; path = ../../../../../../SDL/include/SDL_config.h; sourceTree = "<group>"; };
-		C313FF8F17C0A97900A2ABDA /* SDL_config.h.cmake */ = {isa = PBXFileReference; lastKnownFileType = text; name = SDL_config.h.cmake; path = ../../../../../../SDL/include/SDL_config.h.cmake; sourceTree = "<group>"; };
-		C313FF9017C0A97900A2ABDA /* SDL_config.h.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = SDL_config.h.in; path = ../../../../../../SDL/include/SDL_config.h.in; sourceTree = "<group>"; };
-		C313FF9117C0A97900A2ABDA /* SDL_copying.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_copying.h; path = ../../../../../../SDL/include/SDL_copying.h; sourceTree = "<group>"; };
-		C313FF9217C0A97900A2ABDA /* SDL_cpuinfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_cpuinfo.h; path = ../../../../../../SDL/include/SDL_cpuinfo.h; sourceTree = "<group>"; };
-		C313FF9317C0A97900A2ABDA /* SDL_endian.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_endian.h; path = ../../../../../../SDL/include/SDL_endian.h; sourceTree = "<group>"; };
-		C313FF9417C0A97900A2ABDA /* SDL_error.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_error.h; path = ../../../../../../SDL/include/SDL_error.h; sourceTree = "<group>"; };
-		C313FF9517C0A97900A2ABDA /* SDL_events.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_events.h; path = ../../../../../../SDL/include/SDL_events.h; sourceTree = "<group>"; };
-		C313FF9617C0A97900A2ABDA /* SDL_gamecontroller.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_gamecontroller.h; path = ../../../../../../SDL/include/SDL_gamecontroller.h; sourceTree = "<group>"; };
-		C313FF9717C0A97900A2ABDA /* SDL_gesture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_gesture.h; path = ../../../../../../SDL/include/SDL_gesture.h; sourceTree = "<group>"; };
-		C313FF9817C0A97900A2ABDA /* SDL_haptic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_haptic.h; path = ../../../../../../SDL/include/SDL_haptic.h; sourceTree = "<group>"; };
-		C313FF9917C0A97900A2ABDA /* SDL_hints.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_hints.h; path = ../../../../../../SDL/include/SDL_hints.h; sourceTree = "<group>"; };
-		C313FF9A17C0A97900A2ABDA /* SDL_joystick.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_joystick.h; path = ../../../../../../SDL/include/SDL_joystick.h; sourceTree = "<group>"; };
-		C313FF9B17C0A97900A2ABDA /* SDL_keyboard.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_keyboard.h; path = ../../../../../../SDL/include/SDL_keyboard.h; sourceTree = "<group>"; };
-		C313FF9C17C0A97900A2ABDA /* SDL_keycode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_keycode.h; path = ../../../../../../SDL/include/SDL_keycode.h; sourceTree = "<group>"; };
-		C313FF9D17C0A97900A2ABDA /* SDL_loadso.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_loadso.h; path = ../../../../../../SDL/include/SDL_loadso.h; sourceTree = "<group>"; };
-		C313FF9E17C0A97900A2ABDA /* SDL_log.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_log.h; path = ../../../../../../SDL/include/SDL_log.h; sourceTree = "<group>"; };
-		C313FF9F17C0A97900A2ABDA /* SDL_main.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_main.h; path = ../../../../../../SDL/include/SDL_main.h; sourceTree = "<group>"; };
-		C313FFA017C0A97900A2ABDA /* SDL_messagebox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_messagebox.h; path = ../../../../../../SDL/include/SDL_messagebox.h; sourceTree = "<group>"; };
-		C313FFA117C0A97900A2ABDA /* SDL_mouse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_mouse.h; path = ../../../../../../SDL/include/SDL_mouse.h; sourceTree = "<group>"; };
-		C313FFA217C0A97900A2ABDA /* SDL_mutex.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_mutex.h; path = ../../../../../../SDL/include/SDL_mutex.h; sourceTree = "<group>"; };
-		C313FFA317C0A97900A2ABDA /* SDL_name.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_name.h; path = ../../../../../../SDL/include/SDL_name.h; sourceTree = "<group>"; };
-		C313FFA417C0A97900A2ABDA /* SDL_opengl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_opengl.h; path = ../../../../../../SDL/include/SDL_opengl.h; sourceTree = "<group>"; };
-		C313FFA517C0A97900A2ABDA /* SDL_opengles.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_opengles.h; path = ../../../../../../SDL/include/SDL_opengles.h; sourceTree = "<group>"; };
-		C313FFA617C0A97900A2ABDA /* SDL_opengles2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_opengles2.h; path = ../../../../../../SDL/include/SDL_opengles2.h; sourceTree = "<group>"; };
-		C313FFA717C0A97900A2ABDA /* SDL_pixels.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_pixels.h; path = ../../../../../../SDL/include/SDL_pixels.h; sourceTree = "<group>"; };
-		C313FFA817C0A97900A2ABDA /* SDL_platform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_platform.h; path = ../../../../../../SDL/include/SDL_platform.h; sourceTree = "<group>"; };
-		C313FFA917C0A97900A2ABDA /* SDL_power.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_power.h; path = ../../../../../../SDL/include/SDL_power.h; sourceTree = "<group>"; };
-		C313FFAA17C0A97900A2ABDA /* SDL_quit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_quit.h; path = ../../../../../../SDL/include/SDL_quit.h; sourceTree = "<group>"; };
-		C313FFAB17C0A97900A2ABDA /* SDL_rect.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_rect.h; path = ../../../../../../SDL/include/SDL_rect.h; sourceTree = "<group>"; };
-		C313FFAC17C0A97900A2ABDA /* SDL_render.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_render.h; path = ../../../../../../SDL/include/SDL_render.h; sourceTree = "<group>"; };
-		C313FFAD17C0A97900A2ABDA /* SDL_revision.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_revision.h; path = ../../../../../../SDL/include/SDL_revision.h; sourceTree = "<group>"; };
-		C313FFAE17C0A97900A2ABDA /* SDL_rwops.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_rwops.h; path = ../../../../../../SDL/include/SDL_rwops.h; sourceTree = "<group>"; };
-		C313FFAF17C0A97900A2ABDA /* SDL_scancode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_scancode.h; path = ../../../../../../SDL/include/SDL_scancode.h; sourceTree = "<group>"; };
-		C313FFB017C0A97900A2ABDA /* SDL_shape.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_shape.h; path = ../../../../../../SDL/include/SDL_shape.h; sourceTree = "<group>"; };
-		C313FFB117C0A97900A2ABDA /* SDL_stdinc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_stdinc.h; path = ../../../../../../SDL/include/SDL_stdinc.h; sourceTree = "<group>"; };
-		C313FFB217C0A97900A2ABDA /* SDL_surface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_surface.h; path = ../../../../../../SDL/include/SDL_surface.h; sourceTree = "<group>"; };
-		C313FFB317C0A97900A2ABDA /* SDL_system.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_system.h; path = ../../../../../../SDL/include/SDL_system.h; sourceTree = "<group>"; };
-		C313FFB417C0A97900A2ABDA /* SDL_syswm.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_syswm.h; path = ../../../../../../SDL/include/SDL_syswm.h; sourceTree = "<group>"; };
-		C313FFB517C0A97900A2ABDA /* SDL_test_assert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_test_assert.h; path = ../../../../../../SDL/include/SDL_test_assert.h; sourceTree = "<group>"; };
-		C313FFB617C0A97900A2ABDA /* SDL_test_common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_test_common.h; path = ../../../../../../SDL/include/SDL_test_common.h; sourceTree = "<group>"; };
-		C313FFB717C0A97900A2ABDA /* SDL_test_compare.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_test_compare.h; path = ../../../../../../SDL/include/SDL_test_compare.h; sourceTree = "<group>"; };
-		C313FFB817C0A97900A2ABDA /* SDL_test_crc32.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_test_crc32.h; path = ../../../../../../SDL/include/SDL_test_crc32.h; sourceTree = "<group>"; };
-		C313FFB917C0A97900A2ABDA /* SDL_test_font.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_test_font.h; path = ../../../../../../SDL/include/SDL_test_font.h; sourceTree = "<group>"; };
-		C313FFBA17C0A97900A2ABDA /* SDL_test_fuzzer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_test_fuzzer.h; path = ../../../../../../SDL/include/SDL_test_fuzzer.h; sourceTree = "<group>"; };
-		C313FFBB17C0A97900A2ABDA /* SDL_test_harness.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_test_harness.h; path = ../../../../../../SDL/include/SDL_test_harness.h; sourceTree = "<group>"; };
-		C313FFBC17C0A97900A2ABDA /* SDL_test_images.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_test_images.h; path = ../../../../../../SDL/include/SDL_test_images.h; sourceTree = "<group>"; };
-		C313FFBD17C0A97900A2ABDA /* SDL_test_log.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_test_log.h; path = ../../../../../../SDL/include/SDL_test_log.h; sourceTree = "<group>"; };
-		C313FFBE17C0A97900A2ABDA /* SDL_test_md5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_test_md5.h; path = ../../../../../../SDL/include/SDL_test_md5.h; sourceTree = "<group>"; };
-		C313FFBF17C0A97900A2ABDA /* SDL_test_random.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_test_random.h; path = ../../../../../../SDL/include/SDL_test_random.h; sourceTree = "<group>"; };
-		C313FFC017C0A97900A2ABDA /* SDL_test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_test.h; path = ../../../../../../SDL/include/SDL_test.h; sourceTree = "<group>"; };
-		C313FFC117C0A97900A2ABDA /* SDL_thread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_thread.h; path = ../../../../../../SDL/include/SDL_thread.h; sourceTree = "<group>"; };
-		C313FFC217C0A97900A2ABDA /* SDL_timer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_timer.h; path = ../../../../../../SDL/include/SDL_timer.h; sourceTree = "<group>"; };
-		C313FFC317C0A97900A2ABDA /* SDL_touch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_touch.h; path = ../../../../../../SDL/include/SDL_touch.h; sourceTree = "<group>"; };
-		C313FFC417C0A97900A2ABDA /* SDL_types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_types.h; path = ../../../../../../SDL/include/SDL_types.h; sourceTree = "<group>"; };
-		C313FFC517C0A97900A2ABDA /* SDL_version.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_version.h; path = ../../../../../../SDL/include/SDL_version.h; sourceTree = "<group>"; };
-		C313FFC617C0A97900A2ABDA /* SDL_video.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL_video.h; path = ../../../../../../SDL/include/SDL_video.h; sourceTree = "<group>"; };
-		C313FFC717C0A97900A2ABDA /* SDL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDL.h; path = ../../../../../../SDL/include/SDL.h; sourceTree = "<group>"; };
-		C313FFE217C0ABA600A2ABDA /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
-		C313FFE417C0ABB100A2ABDA /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
-		C313FFE817C0AE9100A2ABDA /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
-		C313FFEA17C0AEC700A2ABDA /* libSDL2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2.a; path = "../../../../../../Library/Developer/Xcode/DerivedData/SDL-gduaazreuumobvbcwmcmpqtcqnnv/Build/Products/Debug-iphonesimulator/libSDL2.a"; sourceTree = "<group>"; };
-		C3324AAE17C0B5FA00897F24 /* libjpeg_ios_simulator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg_ios_simulator.a; path = ../../../../../oxygine/third_party/ios/libraries/libjpeg_ios_simulator.a; sourceTree = "<group>"; };
-		C3324AAF17C0B5FA00897F24 /* libpng_ios_sumulator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng_ios_sumulator.a; path = ../../../../../oxygine/third_party/ios/libraries/libpng_ios_sumulator.a; sourceTree = "<group>"; };
-		C3324AB217C0B62000897F24 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
-		C3324B1A17C0B77600897F24 /* ext */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ext; path = ../../../data/ext; sourceTree = "<group>"; };
-		C3324B1B17C0B77600897F24 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = ../../../data/fonts; sourceTree = "<group>"; };
-		C3324B1C17C0B77600897F24 /* images */ = {isa = PBXFileReference; lastKnownFileType = folder; name = images; path = ../../../data/images; sourceTree = "<group>"; };
-		C3324B1D17C0B77600897F24 /* system */ = {isa = PBXFileReference; lastKnownFileType = folder; name = system; path = ../../../data/system; sourceTree = "<group>"; };
-		C3324B1E17C0B77600897F24 /* xmls */ = {isa = PBXFileReference; lastKnownFileType = folder; name = xmls; path = ../../../data/xmls; sourceTree = "<group>"; };
-		C387047E17C0C19D00015CA8 /* testgles.c_ */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = testgles.c_; path = ../../../../../../SDL/test/testgles.c_; sourceTree = "<group>"; };
-		C387048117C0C33300015CA8 /* SDL_test_assert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_assert.c; path = ../../../../../../SDL/src/test/SDL_test_assert.c; sourceTree = "<group>"; };
-		C387048217C0C33300015CA8 /* SDL_test_common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_common.c; path = ../../../../../../SDL/src/test/SDL_test_common.c; sourceTree = "<group>"; };
-		C387048317C0C33300015CA8 /* SDL_test_compare.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_compare.c; path = ../../../../../../SDL/src/test/SDL_test_compare.c; sourceTree = "<group>"; };
-		C387048417C0C33300015CA8 /* SDL_test_crc32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_crc32.c; path = ../../../../../../SDL/src/test/SDL_test_crc32.c; sourceTree = "<group>"; };
-		C387048517C0C33300015CA8 /* SDL_test_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_font.c; path = ../../../../../../SDL/src/test/SDL_test_font.c; sourceTree = "<group>"; };
-		C387048617C0C33300015CA8 /* SDL_test_fuzzer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_fuzzer.c; path = ../../../../../../SDL/src/test/SDL_test_fuzzer.c; sourceTree = "<group>"; };
-		C387048717C0C33300015CA8 /* SDL_test_harness.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_harness.c; path = ../../../../../../SDL/src/test/SDL_test_harness.c; sourceTree = "<group>"; };
-		C387048817C0C33300015CA8 /* SDL_test_imageBlit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_imageBlit.c; path = ../../../../../../SDL/src/test/SDL_test_imageBlit.c; sourceTree = "<group>"; };
-		C387048917C0C33300015CA8 /* SDL_test_imageBlitBlend.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_imageBlitBlend.c; path = ../../../../../../SDL/src/test/SDL_test_imageBlitBlend.c; sourceTree = "<group>"; };
-		C387048A17C0C33300015CA8 /* SDL_test_imageFace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_imageFace.c; path = ../../../../../../SDL/src/test/SDL_test_imageFace.c; sourceTree = "<group>"; };
-		C387048B17C0C33300015CA8 /* SDL_test_imagePrimitives.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_imagePrimitives.c; path = ../../../../../../SDL/src/test/SDL_test_imagePrimitives.c; sourceTree = "<group>"; };
-		C387048C17C0C33300015CA8 /* SDL_test_imagePrimitivesBlend.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_imagePrimitivesBlend.c; path = ../../../../../../SDL/src/test/SDL_test_imagePrimitivesBlend.c; sourceTree = "<group>"; };
-		C387048D17C0C33300015CA8 /* SDL_test_log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_log.c; path = ../../../../../../SDL/src/test/SDL_test_log.c; sourceTree = "<group>"; };
-		C387048E17C0C33300015CA8 /* SDL_test_md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_md5.c; path = ../../../../../../SDL/src/test/SDL_test_md5.c; sourceTree = "<group>"; };
-		C387048F17C0C33300015CA8 /* SDL_test_random.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_random.c; path = ../../../../../../SDL/src/test/SDL_test_random.c; sourceTree = "<group>"; };
-		C3B3181017C0B06F00903C9D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-		C3B3181417C0B12000903C9D /* entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../../../src/entry_point.cpp; sourceTree = "<group>"; };
-		C3B3181517C0B12000903C9D /* example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../../../src/example.cpp; sourceTree = "<group>"; };
-		C3B3181617C0B12000903C9D /* example.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = example.h; path = ../../../src/example.h; sourceTree = "<group>"; };
-		C3B3181717C0B12000903C9D /* test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = test.cpp; path = ../../../src/test.cpp; sourceTree = "<group>"; };
-		C3B3181817C0B12000903C9D /* test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = test.h; path = ../../../src/test.h; sourceTree = "<group>"; };
-		C3B3181917C0B12000903C9D /* TestBox9Sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestBox9Sprite.h; path = ../../../src/TestBox9Sprite.h; sourceTree = "<group>"; };
-		C3B3181A17C0B12000903C9D /* TestClipRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestClipRect.h; path = ../../../src/TestClipRect.h; sourceTree = "<group>"; };
-		C3B3181B17C0B12000903C9D /* TestComplexDrag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestComplexDrag.h; path = ../../../src/TestComplexDrag.h; sourceTree = "<group>"; };
-		C3B3181C17C0B12000903C9D /* TestDrag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestDrag.h; path = ../../../src/TestDrag.h; sourceTree = "<group>"; };
-		C3B3181D17C0B12000903C9D /* TestManageRes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestManageRes.h; path = ../../../src/TestManageRes.h; sourceTree = "<group>"; };
-		C3B3181E17C0B12000903C9D /* TestMask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestMask.h; path = ../../../src/TestMask.h; sourceTree = "<group>"; };
-		C3B3181F17C0B12000903C9D /* TestPerf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestPerf.h; path = ../../../src/TestPerf.h; sourceTree = "<group>"; };
-		C3B3182017C0B12000903C9D /* TestProgressBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestProgressBar.h; path = ../../../src/TestProgressBar.h; sourceTree = "<group>"; };
-		C3B3182117C0B12000903C9D /* TestRender2Texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestRender2Texture.h; path = ../../../src/TestRender2Texture.h; sourceTree = "<group>"; };
-		C3B3182217C0B12000903C9D /* TestTexel2Pixel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTexel2Pixel.h; path = ../../../src/TestTexel2Pixel.h; sourceTree = "<group>"; };
-		C3B3182317C0B12000903C9D /* TestText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestText.h; path = ../../../src/TestText.h; sourceTree = "<group>"; };
-		C3B3182417C0B12000903C9D /* TestTextureFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTextureFormat.h; path = ../../../src/TestTextureFormat.h; sourceTree = "<group>"; };
-		C3B3182517C0B12000903C9D /* TestTweens.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTweens.h; path = ../../../src/TestTweens.h; sourceTree = "<group>"; };
-		C3B3182617C0B12000903C9D /* TestUserShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestUserShader.h; path = ../../../src/TestUserShader.h; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		C313FF3D17C0A32E00A2ABDA /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				C3324AB317C0B62000897F24 /* libz.dylib in Frameworks */,
-				C3324AAD17C0B59B00897F24 /* liboxygine.a in Frameworks */,
-				C3B3181117C0B06F00903C9D /* QuartzCore.framework in Frameworks */,
-				C313FFE917C0AE9100A2ABDA /* AudioToolbox.framework in Frameworks */,
-				C313FFE517C0ABB100A2ABDA /* CoreAudio.framework in Frameworks */,
-				C313FFE317C0ABA600A2ABDA /* OpenGLES.framework in Frameworks */,
-				C313FF4517C0A32E00A2ABDA /* UIKit.framework in Frameworks */,
-				C313FF4717C0A32E00A2ABDA /* Foundation.framework in Frameworks */,
-				C313FF4917C0A32E00A2ABDA /* CoreGraphics.framework in Frameworks */,
-				C313FFEB17C0AEC700A2ABDA /* libSDL2.a in Frameworks */,
-				C3324AB017C0B5FA00897F24 /* libjpeg_ios_simulator.a in Frameworks */,
-				C3324AB117C0B5FA00897F24 /* libpng_ios_sumulator.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		C30E413517C0B523002956CB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				C30E413917C0B523002956CB /* liboxygine.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		C313FF3517C0A32E00A2ABDA = {
-			isa = PBXGroup;
-			children = (
-				C3324AB217C0B62000897F24 /* libz.dylib */,
-				C3B3181017C0B06F00903C9D /* QuartzCore.framework */,
-				C313FFE817C0AE9100A2ABDA /* AudioToolbox.framework */,
-				C313FFE417C0ABB100A2ABDA /* CoreAudio.framework */,
-				C313FFE217C0ABA600A2ABDA /* OpenGLES.framework */,
-				C313FF4A17C0A32E00A2ABDA /* demo */,
-				C313FF4317C0A32E00A2ABDA /* Frameworks */,
-				C313FF4117C0A32E00A2ABDA /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		C313FF4117C0A32E00A2ABDA /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				C313FF4017C0A32E00A2ABDA /* demo.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		C313FF4317C0A32E00A2ABDA /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				C313FF4417C0A32E00A2ABDA /* UIKit.framework */,
-				C313FF4617C0A32E00A2ABDA /* Foundation.framework */,
-				C313FF4817C0A32E00A2ABDA /* CoreGraphics.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		C313FF4A17C0A32E00A2ABDA /* demo */ = {
-			isa = PBXGroup;
-			children = (
-				C3324AAE17C0B5FA00897F24 /* libjpeg_ios_simulator.a */,
-				C3324AAF17C0B5FA00897F24 /* libpng_ios_sumulator.a */,
-				C30E413417C0B523002956CB /* oxygine.xcodeproj */,
-				C3B3181317C0B11200903C9D /* src */,
-				C313FFEA17C0AEC700A2ABDA /* libSDL2.a */,
-				C313FF7B17C0A94100A2ABDA /* SDL */,
-				C313FF4B17C0A32E00A2ABDA /* Supporting Files */,
-			);
-			path = demo;
-			sourceTree = "<group>";
-		};
-		C313FF4B17C0A32E00A2ABDA /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				C3324B1A17C0B77600897F24 /* ext */,
-				C3324B1B17C0B77600897F24 /* fonts */,
-				C3324B1C17C0B77600897F24 /* images */,
-				C3324B1D17C0B77600897F24 /* system */,
-				C3324B1E17C0B77600897F24 /* xmls */,
-				C313FF4C17C0A32E00A2ABDA /* demo-Info.plist */,
-				C313FF4D17C0A32E00A2ABDA /* InfoPlist.strings */,
-				C313FF5217C0A32E00A2ABDA /* demo-Prefix.pch */,
-				C313FF5617C0A32E00A2ABDA /* Default.png */,
-				C313FF5817C0A32E00A2ABDA /* [email protected] */,
-				C313FF5A17C0A32E00A2ABDA /* [email protected] */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		C313FF7B17C0A94100A2ABDA /* SDL */ = {
-			isa = PBXGroup;
-			children = (
-				C313FF7D17C0A97900A2ABDA /* begin_code.h */,
-				C313FF7E17C0A97900A2ABDA /* close_code.h */,
-				C313FF7F17C0A97900A2ABDA /* doxyfile */,
-				C313FF8017C0A97900A2ABDA /* SDL_assert.h */,
-				C313FF8117C0A97900A2ABDA /* SDL_atomic.h */,
-				C313FF8217C0A97900A2ABDA /* SDL_audio.h */,
-				C313FF8317C0A97900A2ABDA /* SDL_bits.h */,
-				C313FF8417C0A97900A2ABDA /* SDL_blendmode.h */,
-				C313FF8517C0A97900A2ABDA /* SDL_clipboard.h */,
-				C313FF8617C0A97900A2ABDA /* SDL_config_android.h */,
-				C313FF8717C0A97900A2ABDA /* SDL_config_iphoneos.h */,
-				C313FF8817C0A97900A2ABDA /* SDL_config_macosx.h */,
-				C313FF8917C0A97900A2ABDA /* SDL_config_minimal.h */,
-				C313FF8A17C0A97900A2ABDA /* SDL_config_pandora.h */,
-				C313FF8B17C0A97900A2ABDA /* SDL_config_psp.h */,
-				C313FF8C17C0A97900A2ABDA /* SDL_config_windows.h */,
-				C313FF8D17C0A97900A2ABDA /* SDL_config_wiz.h */,
-				C313FF8E17C0A97900A2ABDA /* SDL_config.h */,
-				C313FF8F17C0A97900A2ABDA /* SDL_config.h.cmake */,
-				C313FF9017C0A97900A2ABDA /* SDL_config.h.in */,
-				C313FF9117C0A97900A2ABDA /* SDL_copying.h */,
-				C313FF9217C0A97900A2ABDA /* SDL_cpuinfo.h */,
-				C313FF9317C0A97900A2ABDA /* SDL_endian.h */,
-				C313FF9417C0A97900A2ABDA /* SDL_error.h */,
-				C313FF9517C0A97900A2ABDA /* SDL_events.h */,
-				C313FF9617C0A97900A2ABDA /* SDL_gamecontroller.h */,
-				C313FF9717C0A97900A2ABDA /* SDL_gesture.h */,
-				C313FF9817C0A97900A2ABDA /* SDL_haptic.h */,
-				C313FF9917C0A97900A2ABDA /* SDL_hints.h */,
-				C313FF9A17C0A97900A2ABDA /* SDL_joystick.h */,
-				C313FF9B17C0A97900A2ABDA /* SDL_keyboard.h */,
-				C313FF9C17C0A97900A2ABDA /* SDL_keycode.h */,
-				C313FF9D17C0A97900A2ABDA /* SDL_loadso.h */,
-				C313FF9E17C0A97900A2ABDA /* SDL_log.h */,
-				C313FF9F17C0A97900A2ABDA /* SDL_main.h */,
-				C313FFA017C0A97900A2ABDA /* SDL_messagebox.h */,
-				C313FFA117C0A97900A2ABDA /* SDL_mouse.h */,
-				C313FFA217C0A97900A2ABDA /* SDL_mutex.h */,
-				C313FFA317C0A97900A2ABDA /* SDL_name.h */,
-				C313FFA417C0A97900A2ABDA /* SDL_opengl.h */,
-				C313FFA517C0A97900A2ABDA /* SDL_opengles.h */,
-				C313FFA617C0A97900A2ABDA /* SDL_opengles2.h */,
-				C313FFA717C0A97900A2ABDA /* SDL_pixels.h */,
-				C313FFA817C0A97900A2ABDA /* SDL_platform.h */,
-				C313FFA917C0A97900A2ABDA /* SDL_power.h */,
-				C313FFAA17C0A97900A2ABDA /* SDL_quit.h */,
-				C313FFAB17C0A97900A2ABDA /* SDL_rect.h */,
-				C313FFAC17C0A97900A2ABDA /* SDL_render.h */,
-				C313FFAD17C0A97900A2ABDA /* SDL_revision.h */,
-				C313FFAE17C0A97900A2ABDA /* SDL_rwops.h */,
-				C313FFAF17C0A97900A2ABDA /* SDL_scancode.h */,
-				C313FFB017C0A97900A2ABDA /* SDL_shape.h */,
-				C313FFB117C0A97900A2ABDA /* SDL_stdinc.h */,
-				C313FFB217C0A97900A2ABDA /* SDL_surface.h */,
-				C313FFB317C0A97900A2ABDA /* SDL_system.h */,
-				C313FFB417C0A97900A2ABDA /* SDL_syswm.h */,
-				C313FFB517C0A97900A2ABDA /* SDL_test_assert.h */,
-				C313FFB617C0A97900A2ABDA /* SDL_test_common.h */,
-				C313FFB717C0A97900A2ABDA /* SDL_test_compare.h */,
-				C313FFB817C0A97900A2ABDA /* SDL_test_crc32.h */,
-				C313FFB917C0A97900A2ABDA /* SDL_test_font.h */,
-				C313FFBA17C0A97900A2ABDA /* SDL_test_fuzzer.h */,
-				C313FFBB17C0A97900A2ABDA /* SDL_test_harness.h */,
-				C313FFBC17C0A97900A2ABDA /* SDL_test_images.h */,
-				C313FFBD17C0A97900A2ABDA /* SDL_test_log.h */,
-				C313FFBE17C0A97900A2ABDA /* SDL_test_md5.h */,
-				C313FFBF17C0A97900A2ABDA /* SDL_test_random.h */,
-				C313FFC017C0A97900A2ABDA /* SDL_test.h */,
-				C313FFC117C0A97900A2ABDA /* SDL_thread.h */,
-				C313FFC217C0A97900A2ABDA /* SDL_timer.h */,
-				C313FFC317C0A97900A2ABDA /* SDL_touch.h */,
-				C313FFC417C0A97900A2ABDA /* SDL_types.h */,
-				C313FFC517C0A97900A2ABDA /* SDL_version.h */,
-				C313FFC617C0A97900A2ABDA /* SDL_video.h */,
-				C313FFC717C0A97900A2ABDA /* SDL.h */,
-			);
-			name = SDL;
-			sourceTree = "<group>";
-		};
-		C387048017C0C2D000015CA8 /* New Group */ = {
-			isa = PBXGroup;
-			children = (
-				C387048117C0C33300015CA8 /* SDL_test_assert.c */,
-				C387048217C0C33300015CA8 /* SDL_test_common.c */,
-				C387048317C0C33300015CA8 /* SDL_test_compare.c */,
-				C387048417C0C33300015CA8 /* SDL_test_crc32.c */,
-				C387048517C0C33300015CA8 /* SDL_test_font.c */,
-				C387048617C0C33300015CA8 /* SDL_test_fuzzer.c */,
-				C387048717C0C33300015CA8 /* SDL_test_harness.c */,
-				C387048817C0C33300015CA8 /* SDL_test_imageBlit.c */,
-				C387048917C0C33300015CA8 /* SDL_test_imageBlitBlend.c */,
-				C387048A17C0C33300015CA8 /* SDL_test_imageFace.c */,
-				C387048B17C0C33300015CA8 /* SDL_test_imagePrimitives.c */,
-				C387048C17C0C33300015CA8 /* SDL_test_imagePrimitivesBlend.c */,
-				C387048D17C0C33300015CA8 /* SDL_test_log.c */,
-				C387048E17C0C33300015CA8 /* SDL_test_md5.c */,
-				C387048F17C0C33300015CA8 /* SDL_test_random.c */,
-			);
-			name = "New Group";
-			sourceTree = "<group>";
-		};
-		C3B3181317C0B11200903C9D /* src */ = {
-			isa = PBXGroup;
-			children = (
-				C387048017C0C2D000015CA8 /* New Group */,
-				C387047E17C0C19D00015CA8 /* testgles.c_ */,
-				C3B3181417C0B12000903C9D /* entry_point.cpp */,
-				C3B3181517C0B12000903C9D /* example.cpp */,
-				C3B3181617C0B12000903C9D /* example.h */,
-				C3B3181717C0B12000903C9D /* test.cpp */,
-				C3B3181817C0B12000903C9D /* test.h */,
-				C3B3181917C0B12000903C9D /* TestBox9Sprite.h */,
-				C3B3181A17C0B12000903C9D /* TestClipRect.h */,
-				C3B3181B17C0B12000903C9D /* TestComplexDrag.h */,
-				C3B3181C17C0B12000903C9D /* TestDrag.h */,
-				C3B3181D17C0B12000903C9D /* TestManageRes.h */,
-				C3B3181E17C0B12000903C9D /* TestMask.h */,
-				C3B3181F17C0B12000903C9D /* TestPerf.h */,
-				C3B3182017C0B12000903C9D /* TestProgressBar.h */,
-				C3B3182117C0B12000903C9D /* TestRender2Texture.h */,
-				C3B3182217C0B12000903C9D /* TestTexel2Pixel.h */,
-				C3B3182317C0B12000903C9D /* TestText.h */,
-				C3B3182417C0B12000903C9D /* TestTextureFormat.h */,
-				C3B3182517C0B12000903C9D /* TestTweens.h */,
-				C3B3182617C0B12000903C9D /* TestUserShader.h */,
-			);
-			name = src;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		C313FF3F17C0A32E00A2ABDA /* demo */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = C313FF6717C0A32E00A2ABDA /* Build configuration list for PBXNativeTarget "demo" */;
-			buildPhases = (
-				C313FF3C17C0A32E00A2ABDA /* Sources */,
-				C313FF3D17C0A32E00A2ABDA /* Frameworks */,
-				C313FF3E17C0A32E00A2ABDA /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				C3324AAC17C0B56E00897F24 /* PBXTargetDependency */,
-			);
-			name = demo;
-			productName = demo;
-			productReference = C313FF4017C0A32E00A2ABDA /* demo.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		C313FF3717C0A32E00A2ABDA /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0450;
-				ORGANIZATIONNAME = denism;
-			};
-			buildConfigurationList = C313FF3A17C0A32E00A2ABDA /* Build configuration list for PBXProject "demo" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-			);
-			mainGroup = C313FF3517C0A32E00A2ABDA;
-			productRefGroup = C313FF4117C0A32E00A2ABDA /* Products */;
-			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = C30E413517C0B523002956CB /* Products */;
-					ProjectRef = C30E413417C0B523002956CB /* oxygine.xcodeproj */;
-				},
-			);
-			projectRoot = "";
-			targets = (
-				C313FF3F17C0A32E00A2ABDA /* demo */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXReferenceProxy section */
-		C30E413917C0B523002956CB /* liboxygine.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = liboxygine.a;
-			remoteRef = C30E413817C0B523002956CB /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
-/* Begin PBXResourcesBuildPhase section */
-		C313FF3E17C0A32E00A2ABDA /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				C313FF4F17C0A32E00A2ABDA /* InfoPlist.strings in Resources */,
-				C313FF5717C0A32E00A2ABDA /* Default.png in Resources */,
-				C313FF5917C0A32E00A2ABDA /* [email protected] in Resources */,
-				C313FF5B17C0A32E00A2ABDA /* [email protected] in Resources */,
-				C3324B1F17C0B77600897F24 /* ext in Resources */,
-				C3324B2017C0B77600897F24 /* fonts in Resources */,
-				C3324B2117C0B77600897F24 /* images in Resources */,
-				C3324B2217C0B77600897F24 /* system in Resources */,
-				C3324B2317C0B77600897F24 /* xmls in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		C313FF3C17C0A32E00A2ABDA /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				C3B3182717C0B12000903C9D /* entry_point.cpp in Sources */,
-				C3B3182817C0B12000903C9D /* example.cpp in Sources */,
-				C3B3182917C0B12000903C9D /* test.cpp in Sources */,
-				C387047F17C0C19D00015CA8 /* testgles.c_ in Sources */,
-				C387049017C0C33300015CA8 /* SDL_test_assert.c in Sources */,
-				C387049117C0C33300015CA8 /* SDL_test_common.c in Sources */,
-				C387049217C0C33300015CA8 /* SDL_test_compare.c in Sources */,
-				C387049317C0C33300015CA8 /* SDL_test_crc32.c in Sources */,
-				C387049417C0C33300015CA8 /* SDL_test_font.c in Sources */,
-				C387049517C0C33300015CA8 /* SDL_test_fuzzer.c in Sources */,
-				C387049617C0C33300015CA8 /* SDL_test_harness.c in Sources */,
-				C387049717C0C33300015CA8 /* SDL_test_imageBlit.c in Sources */,
-				C387049817C0C33300015CA8 /* SDL_test_imageBlitBlend.c in Sources */,
-				C387049917C0C33300015CA8 /* SDL_test_imageFace.c in Sources */,
-				C387049A17C0C33300015CA8 /* SDL_test_imagePrimitives.c in Sources */,
-				C387049B17C0C33300015CA8 /* SDL_test_imagePrimitivesBlend.c in Sources */,
-				C387049C17C0C33300015CA8 /* SDL_test_log.c in Sources */,
-				C387049D17C0C33300015CA8 /* SDL_test_md5.c in Sources */,
-				C387049E17C0C33300015CA8 /* SDL_test_random.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		C3324AAC17C0B56E00897F24 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = oxygine;
-			targetProxy = C3324AAB17C0B56E00897F24 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		C313FF4D17C0A32E00A2ABDA /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				C313FF4E17C0A32E00A2ABDA /* en */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		C313FF6517C0A32E00A2ABDA /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-					"OXYGINE_SDL=1",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(OXYGINE)/oxygine/src";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
-				ONLY_ACTIVE_ARCH = YES;
-				OXYGINE = ../../../../;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		C313FF6617C0A32E00A2ABDA /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_PREPROCESSOR_DEFINITIONS = "OXYGINE_SDL=1";
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(OXYGINE)/oxygine/src";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
-				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
-				OXYGINE = ../../../../;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		C313FF6817C0A32E00A2ABDA /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "demo/demo-Prefix.pch";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-					"OXYGINE_SDL=1",
-					OX_DEBUG,
-				);
-				INFOPLIST_FILE = "demo/demo-Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../../../../Library/Developer/Xcode/DerivedData/SDL-gduaazreuumobvbcwmcmpqtcqnnv/Build/Products/Debug-iphonesimulator\"",
-					"\"$(SRCROOT)/../../../../oxygine/third_party/ios/libraries\"",
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Debug;
-		};
-		C313FF6917C0A32E00A2ABDA /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "demo/demo-Prefix.pch";
-				INFOPLIST_FILE = "demo/demo-Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../../../../Library/Developer/Xcode/DerivedData/SDL-gduaazreuumobvbcwmcmpqtcqnnv/Build/Products/Debug-iphonesimulator\"",
-					"\"$(SRCROOT)/../../../../oxygine/third_party/ios/libraries\"",
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		C313FF3A17C0A32E00A2ABDA /* Build configuration list for PBXProject "demo" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C313FF6517C0A32E00A2ABDA /* Debug */,
-				C313FF6617C0A32E00A2ABDA /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		C313FF6717C0A32E00A2ABDA /* Build configuration list for PBXNativeTarget "demo" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C313FF6817C0A32E00A2ABDA /* Debug */,
-				C313FF6917C0A32E00A2ABDA /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = C313FF3717C0A32E00A2ABDA /* Project object */;
-}

examples/Demo/ios/demo/demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:demo.xcodeproj">
-   </FileRef>
-</Workspace>

examples/Demo/ios/demo/demo/demo-Info.plist

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.oxygine.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>

examples/Demo/ios/demo/demo/demo-Prefix.pch

@@ -1,14 +0,0 @@
-//
-// Prefix header for all source files of the 'demo' target in the 'demo' project
-//
-
-#import <Availability.h>
-
-#ifndef __IPHONE_4_0
-#warning "This project uses features only available in iOS SDK 4.0 and later."
-#endif
-
-#ifdef __OBJC__
-    #import <UIKit/UIKit.h>
-    #import <Foundation/Foundation.h>
-#endif

examples/Demo/ios/demo/demo/en.lproj/InfoPlist.strings

@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-

examples/Demo/src/TestTweens.h

@@ -108,8 +108,11 @@ public:
 		string str = "unknown";
 		switch(_ease)
 		{
+        case Tween::ease_unknown:
+            str = "ease: unknown";
+            break;
 		case Tween::ease_linear:
-			str = "ease: Linear";
+			str = "ease: linear";
 			break;
 		case Tween::ease_inExpo:
 			str = "ease: inExpo";
@@ -194,9 +197,9 @@ public:
 		if (id == "TweenQueue")
 		{
 			spTweenQueue queue = new TweenQueue();			
-			queue->add(createTween(TweenAnim(resources.getResAnim("anim")), 500, 1))
-				->add(createTween(Actor::TweenRotation(_sprite->getRotation() + (float)MATH_PI * 2.0f), 500, 1, false, 1000))
-				->add(createTween(Actor::TweenScale(2), 500, 1, true));
+			queue->add(createTween(TweenAnim(resources.getResAnim("anim")), 500, 1));
+			queue->add(createTween(Actor::TweenRotation(_sprite->getRotation() + (float)MATH_PI * 2.0f), 500, 1, false, 1000));
+			queue->add(createTween(Actor::TweenScale(2), 500, 1, true));
 			_addTween(queue);
 		}
 

examples/Demo/src/example.cpp

@@ -28,6 +28,7 @@ Actor *_tests = 0;
 Resources resources;
 Resources resourcesUI;
 
+
 class TestActor: public Test
 {
 public:		

examples/Demo/win32/HelloWorld_vs2010.sln

@@ -1,52 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld_vs2010", "HelloWorld_vs2010.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "..\..\..\..\SDL\VisualC\SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "..\..\..\..\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oxygine_vs2010", "..\..\..\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Debug|Win32.Build.0 = Debug|Win32
-		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Debug|x64.ActiveCfg = Debug|Win32
-		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Release|Win32.ActiveCfg = Release|Win32
-		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Release|Win32.Build.0 = Release|Win32
-		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Release|x64.ActiveCfg = Release|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64
-		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Debug|Win32.Build.0 = Debug|Win32
-		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Debug|x64.ActiveCfg = Debug|Win32
-		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Release|Win32.ActiveCfg = Release|Win32
-		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Release|Win32.Build.0 = Release|Win32
-		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Release|x64.ActiveCfg = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

examples/GameTemplate/src/GameActor.cpp

@@ -72,11 +72,9 @@ void GameActor::postShowing()
 	go->setScale(Vector2(2.0f, 2.0f));	
 	go->setPosition(virtualSize/2);
 	spTweenQueue queue = new TweenQueue();
-	queue->add(createTween(Actor::TweenScale(Vector2(1.0f, 1.0f)), 200))
-		->add(createTween(Actor::TweenAlpha(0), 400, 3, true))
-		->add(createTween(Actor::TweenAlpha(255), 400))
-		//->add(createTween(Actor::TweenPosition(Vector2((float)(virtualSize.x + go->getWidth()), virtualSize.y/2.0f)), 400))
-		;
+	queue->add(Actor::TweenScale(Vector2(1.0f, 1.0f)), 200);
+	queue->add(Actor::TweenAlpha(0), 400, 3, true);
+	queue->add(Actor::TweenAlpha(255), 400);
 	go->addTween(queue);
 	//queue->setDetachActor(true);
 

examples/Match3/src/jewels.cpp

@@ -39,8 +39,8 @@ void Jewel::SetSelected()
 	setPosition(Vector2(getPosition().x+JEWEL_SIZE/2, getPosition().y+JEWEL_SIZE/2));
 	setAnchor(Vector2(0.5f,0.5f));
 
-	tween->add(createTween(Sprite::TweenRotation(MATH_PI * 0.1f), 100))
-		->add(createTween(Sprite::TweenRotation(MATH_PI  * (-0.1f)), 400,-1,true));
+	tween->add(Sprite::TweenRotation(MATH_PI * 0.1f), 100);
+	tween->add(Sprite::TweenRotation(MATH_PI  * (-0.1f)), 400,-1,true);
 
 
 	addTween(tween);

oxygine/SDL/oxygine_xcode/oxygine/oxygine.xcodeproj/project.pbxproj

@@ -32,6 +32,7 @@
 		0472E38017F8A2EC0016A832 /* MaskedSprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 0472E37C17F8A2EC0016A832 /* MaskedSprite.h */; };
 		0472E38117F8A2EC0016A832 /* oxygine_include.h in Headers */ = {isa = PBXBuildFile; fileRef = 0472E37D17F8A2EC0016A832 /* oxygine_include.h */; };
 		0472E38217F8A2EC0016A832 /* oxygine-framework.h in Headers */ = {isa = PBXBuildFile; fileRef = 0472E37E17F8A2EC0016A832 /* oxygine-framework.h */; };
+		049B64AB1803054300EC333E /* CreateResourceContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 049B64AA1803054300EC333E /* CreateResourceContext.cpp */; };
 		C38704A217C0C6AC00015CA8 /* VideoDriverGLES11.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C38704A017C0C6AC00015CA8 /* VideoDriverGLES11.cpp */; };
 		C38704A317C0C6AC00015CA8 /* VideoDriverGLES11.h in Headers */ = {isa = PBXBuildFile; fileRef = C38704A117C0C6AC00015CA8 /* VideoDriverGLES11.h */; };
 		C38704A617C0C71700015CA8 /* VideoDriverGLES20.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C38704A417C0C71700015CA8 /* VideoDriverGLES20.cpp */; };
@@ -215,6 +216,8 @@
 		0472E37C17F8A2EC0016A832 /* MaskedSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MaskedSprite.h; path = ../../../src/MaskedSprite.h; sourceTree = "<group>"; };
 		0472E37D17F8A2EC0016A832 /* oxygine_include.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = oxygine_include.h; path = ../../../src/oxygine_include.h; sourceTree = "<group>"; };
 		0472E37E17F8A2EC0016A832 /* oxygine-framework.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "oxygine-framework.h"; path = "../../../src/oxygine-framework.h"; sourceTree = "<group>"; };
+		048B7AAB17FDE25E00AE2D0B /* shader.glsl */ = {isa = PBXFileReference; lastKnownFileType = text; name = shader.glsl; path = ../../../system_data/original/system/shader.glsl; sourceTree = "<group>"; };
+		049B64AA1803054300EC333E /* CreateResourceContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CreateResourceContext.cpp; sourceTree = "<group>"; };
 		C38704A017C0C6AC00015CA8 /* VideoDriverGLES11.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VideoDriverGLES11.cpp; path = gl/VideoDriverGLES11.cpp; sourceTree = "<group>"; };
 		C38704A117C0C6AC00015CA8 /* VideoDriverGLES11.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VideoDriverGLES11.h; path = gl/VideoDriverGLES11.h; sourceTree = "<group>"; };
 		C38704A417C0C71700015CA8 /* VideoDriverGLES20.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VideoDriverGLES20.cpp; path = gl/VideoDriverGLES20.cpp; sourceTree = "<group>"; };
@@ -431,6 +434,7 @@
 		C3E86F4116EBC8A500052915 = {
 			isa = PBXGroup;
 			children = (
+				048B7AAB17FDE25E00AE2D0B /* shader.glsl */,
 				C38EC22B1709600E00568283 /* OpenGLES.framework */,
 				C3E86F5316EBC8C200052915 /* src */,
 				C3E86F4D16EBC8A500052915 /* Products */,
@@ -616,6 +620,7 @@
 		C3E86FBB16EBC8EB00052915 /* res */ = {
 			isa = PBXGroup;
 			children = (
+				049B64AA1803054300EC333E /* CreateResourceContext.cpp */,
 				C3E86FBC16EBC8EB00052915 /* .oxbuild */,
 				C3E86FBD16EBC8EB00052915 /* CreateResourceContext.h */,
 				C3E86FBE16EBC8EB00052915 /* ResAnim.cpp */,
@@ -942,6 +947,7 @@
 				C38704A217C0C6AC00015CA8 /* VideoDriverGLES11.cpp in Sources */,
 				0472E35B17F8A1A80016A832 /* log.cpp in Sources */,
 				C38704A617C0C71700015CA8 /* VideoDriverGLES20.cpp in Sources */,
+				049B64AB1803054300EC333E /* CreateResourceContext.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1025,6 +1031,7 @@
 					OXYGINE_SDL,
 					OX_DEBUG,
 				);
+				GCC_WARN_UNUSED_VARIABLE = NO;
 				HEADER_SEARCH_PATHS = (
 					../../../greenlets/src,
 					"$(SDL)/include/",
@@ -1040,6 +1047,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
+				GCC_WARN_UNUSED_VARIABLE = NO;
 				HEADER_SEARCH_PATHS = (
 					../../../greenlets/src,
 					"$(SDL)/include/",

oxygine/src/Blocking.cpp

@@ -59,27 +59,31 @@ namespace oxygine
 		{
 		public:
 			bool _clicked;
+			timeMS _timeOut;
 
 			void click(Event *ev)
 			{
 				_clicked = true;
 			}
 
-			clickWait(spActor button):_clicked(false)
+			clickWait(spActor button, timeMS timeOut):_clicked(false), _timeOut(timeOut)
 			{
+				timeMS start = getTimeMS();
 				button->addEventListener(TouchEvent::CLICK, CLOSURE(this, &clickWait::click));
 				do
 				{
 					yield();
+					if (timeOut > 0 && (getTimeMS() - start > timeOut))					
+						break;
 				} while (!_clicked);
 
 				button->removeEventListeners(this);
 			}
 		};
 
-		void waitClick(spActor button)
+		void waitClick(spActor button, timeMS timeOut)
 		{
-			clickWait w(button);			
+			clickWait w(button, timeOut);			
 		}
 	}
 }

oxygine/src/Blocking.h

@@ -25,6 +25,6 @@ namespace oxygine
 		void waitTween(spTween);
 		void waitTime(spClock clock, timeMS time);
 		void waitTime(timeMS time);
-		void waitClick(spActor);
+		void waitClick(spActor, timeMS timeOut = 0);
 	}
 }

oxygine/src/DebugActor.cpp

@@ -31,10 +31,8 @@
 
 namespace oxygine
 {
-	wstring div(const string &val, const Color &color);
-
-
 	Resources* DebugActor::resSystem = 0;
+	file::ZipFileSystem zp;
 
 	spDebugActor DebugActor::instance;
 
@@ -43,14 +41,13 @@ namespace oxygine
 		if (resSystem)
 			return;
 
-		file::ZipFileSystem zp;
 		zp.setPrefix("system/");
 		zp.add(system_data, system_size);
 
 		file::mount(&zp);
 		resSystem = new Resources;
 		resSystem->loadXML("system/res.xml", 0, true, false, "system");
-		file::unmount(&zp);
+		//
 
 		//log::messageln("initialized DebugActor");
 	}
@@ -60,6 +57,7 @@ namespace oxygine
 		instance = 0;
 		delete resSystem;
 		resSystem = 0;
+		file::unmount(&zp);
 	}
 	
 	void DebugActor::setCornerPosition(int corner)
@@ -117,8 +115,12 @@ namespace oxygine
 		float x = getWidth();
 		addButton(x, "tree", "tree");
 		addButton(x, "finger", "finger");		
-#ifdef _DEBUG
+#ifdef OXYGINE_DEBUG_T2P
 		addButton(x, "t2p", "t2p");
+#endif
+
+#ifdef OXYGINE_DEBUG_OBJECTS
+		
 		addButton(x, "images", "images");		
 #endif
 		
@@ -131,7 +133,7 @@ namespace oxygine
 		_text->setWidth(getWidth());
 		_text->setText("debug text");
 
-		RootActor::instance->addEventListener(TouchEvent::MOVE, CLOSURE(this, &DebugActor::onDAEvent));
+		getRoot()->addEventListener(TouchEvent::MOVE, CLOSURE(this, &DebugActor::onDAEvent));
 
 		instance = this;
 	}
@@ -203,7 +205,8 @@ namespace oxygine
 
 	DebugActor::~DebugActor()
 	{
-
+		if (getRoot())
+			getRoot()->removeEventListeners(this);
 	}
 
 	void DebugActor::doUpdate(const UpdateState &us)
@@ -236,7 +239,7 @@ namespace oxygine
 		s << "fps=" << fps << " mem=" << mem_used << endl;
 		s << "mfree=" << mem_free << endl;
 
-#ifdef OX_DEBUG
+#ifdef OXYGINE_DEBUG_OBJECTS
 		s << "objects=" << (int)__objects.size() << endl;
 #endif
 		s << "batches="<< batches << " triangles=" << triangles << endl;
@@ -291,7 +294,7 @@ namespace oxygine
 	void DebugActor::showTexel2PixelErrors(bool show)
 	{
 		_showTexel2PixelErrors = show;
-#ifdef _DEBUG
+#ifdef OXYGINE_DEBUG_T2P
 		Renderer::showTexel2PixelErrors(_showTexel2PixelErrors);
 		spActor btn = getChild("t2p");
 		btn->removeTweens(true);

oxygine/src/EventDispatcher.h

@@ -8,11 +8,8 @@ namespace oxygine
 {
 	typedef int eventType;
 	DECLARE_SMART(EventDispatcher, spEventDispatcher);	
-
-
-
-	//DECLARE_SMART(Event, spNewEvent);
-	class Event//: public Object
+	
+	class Event
 	{
 	public:
 		enum {COMPLETE = makefourcc('_', 'E', 'C', 'M')};
@@ -30,10 +27,13 @@ namespace oxygine
 		bool stopsImmediatePropagation;
 		bool stopsPropagation;
 
+		void *userData;
+		spObject userDataObject;
+
 		spEventDispatcher target;
 		spEventDispatcher currentTarget;// = object with our listener
 
-		Event(eventType Type, bool Bubbles = false):type(Type), phase(phase_target), bubbles(Bubbles), stopsImmediatePropagation(false), stopsPropagation(false){}
+		Event(eventType Type, bool Bubbles = false):userData(0), type(Type), phase(phase_target), bubbles(Bubbles), stopsImmediatePropagation(false), stopsPropagation(false){}
 
 		virtual ~Event(){}
 

oxygine/src/Multithreading.cpp

@@ -55,6 +55,11 @@ namespace oxygine
 			_m2n->push(src, dest);
 		}
 
+		bool isNeedProceed(spNativeTexture t)
+		{
+			return t->getHandle() == 0;
+		}
+
 	private:
 		Mem2Native *_m2n;
 	};

oxygine/src/RootActor.h

@@ -15,6 +15,7 @@ namespace oxygine
 		{
 			ACTIVATE = makefourcc('_', 'R', 'A', 'c'),
 			DEACTIVATE = makefourcc('_', 'R', 'D', 'c'),
+			LOST_CONTEXT = makefourcc('_', 'R', 'L', 'C'),
 		};
 
 		static spRootActor instance;

oxygine/src/TextActor.cpp

@@ -189,6 +189,7 @@ namespace oxygine
 	{
 		switch (v)
 		{
+                
 		case TextStyle::VALIGN_BASELINE:
 			return "baseline";
 		case TextStyle::VALIGN_TOP:
@@ -205,6 +206,8 @@ namespace oxygine
 	{
 		switch (v)
 		{
+        case TextStyle::HALIGN_DEFAULT:
+            return "default";
 		case TextStyle::HALIGN_LEFT:
 			return "left";
 		case TextStyle::HALIGN_RIGHT:

oxygine/src/Tweener.cpp

@@ -136,8 +136,6 @@ namespace oxygine
 
 	void Tween::callDone(Actor &actor, const UpdateState *us)
 	{
-		OX_ASSERT(_client);
-
 		if (_remove)
 		{
 			actor.detach();
@@ -225,14 +223,14 @@ namespace oxygine
 	}
 
 	
-	TweenQueue *TweenQueue::add(spTween t)
+	spTween TweenQueue::add(spTween t)
 	{
 		OX_ASSERT(t);
 		if (!t)
 			return 0;
 
 		_tweens.append(t);		
-		return this;
+		return t;
 	}
 
 	bool TweenQueue::start(Actor &actor)
@@ -261,6 +259,7 @@ namespace oxygine
 			bool done = _current->update(actor, us);
 			if (done)
 			{
+				_current->callDone(actor, &us);
 				_current = next;
 			}
 			else

oxygine/src/Tweener.h

@@ -155,6 +155,7 @@ namespace oxygine
 		static float calcEase(EASE ease, float v);
 
 	protected:
+		friend class TweenQueue;
 		timeMS _elapsed;		
 		timeMS _duration;
 		timeMS _delay;
@@ -222,10 +223,10 @@ namespace oxygine
 	class TweenQueue: public Tween
 	{
 	public:
-		TweenQueue *add(spTween t);
+		spTween add(spTween t);
 
 		template<class GS>
-		TweenQueue* add(const GS &gs, timeMS duration, int loops = 1, bool twoSides = false, timeMS delay = 0, Tween::EASE ease = Tween::ease_linear)
+		spTween add(const GS &gs, timeMS duration, int loops = 1, bool twoSides = false, timeMS delay = 0, Tween::EASE ease = Tween::ease_linear)
 		{return add(createTween(gs, duration, loops, twoSides, delay, ease));}
 
 		bool start(Actor &actor);

oxygine/src/core/NativeTexture.cpp

@@ -31,7 +31,72 @@ namespace oxygine
 		LOAD_FUNC(PFNGLDELETEFRAMEBUFFERSOESPROC, glDeleteFramebuffersOES);
 	*/};
 
+
+	typedef vector<Restorable*> restorable;
+	restorable _restorable;
+	bool _restoring = false;
+
+	restorable::iterator  findRestorable(Restorable *r)
+	{
+		restorable::iterator i = find(_restorable.begin(), _restorable.end(), r);
+		return i;
+	}
+
+	void Restorable::restoreAll()
+	{
+		restorable rs;
+		swap(rs, _restorable);
+		for (restorable::iterator i = rs.begin(); i != rs.end(); ++i)
+		{
+			Restorable *r = *i;
+			r->restore();
+		}
+		//_restoring = false;
+	}
 	
+	Restorable::Restorable(): _registered(false)
+	{
+
+	}
+
+	Restorable::~Restorable()
+	{
+		unreg();
+	}
+
+	void Restorable::reg(RestoreCallback cb, void *user)
+	{
+		if (_registered)
+			return;
+
+		OX_ASSERT(_restoring == false);
+		_cb = cb;
+		_userData = user;
+
+		_registered = true;
+		restorable::iterator i = findRestorable(this);
+		OX_ASSERT(i == _restorable.end());
+		_restorable.push_back(this);
+	}
+
+	void Restorable::unreg()
+	{
+		if (!_registered)
+			return;
+		OX_ASSERT(_restoring == false);
+		restorable::iterator i = find(_restorable.begin(), _restorable.end(), this);
+		OX_ASSERT(i != _restorable.end());
+		_restorable.erase(i);
+		_registered = false;
+	}
+
+	void Restorable::restore()
+	{
+		if (!_cb)
+			return;
+
+		_cb(this, _userData);
+	}
 
 	volatile int NativeTexture::created = 0;
 
@@ -92,6 +157,11 @@ namespace oxygine
 
 	}
 
+	void NativeTextureNull::invalidate()
+	{
+
+	}
+
 	ImageData NativeTextureNull::lock(lock_flags, const Rect *src)
 	{
 		return ImageData();

oxygine/src/core/NativeTexture.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "oxygine_include.h"
+#include "closure/closure.h"
 #include "ox_debug.h"
 #include "Texture.h"
 
@@ -12,8 +13,31 @@ namespace oxygine
 
 	typedef void* nativeTextureHandle;
 
+	class Restorable
+	{
+	public:
+		Restorable();
+		virtual ~Restorable();
+
+		static void restoreAll();
+				
+		virtual void *_getRestorableObject() = 0;
+
+		void restore();
+		typedef Closure<void (Restorable *, void *userData)> RestoreCallback;
+
+		void reg(RestoreCallback cb, void *user);
+		void unreg();
+
+	protected:		
+
+	private:		
+		RestoreCallback _cb;
+		void *_userData;		
+		bool _registered;
+	};
 	
-	class NativeTexture: public Texture
+	class NativeTexture: public Texture, public Restorable
 	{
 	public:
 		NativeTexture():_vram(0){}
@@ -21,6 +45,7 @@ namespace oxygine
 		virtual void init(int w, int h, TextureFormat tf, bool renderTarget = false) = 0;
 		virtual void init(const ImageData &src, bool sysMemCopy) = 0;
 		virtual void release() = 0;
+		virtual void invalidate() = 0;
 
 		virtual ImageData lock(lock_flags, const Rect *src) = 0;
 		virtual void unlock() = 0;
@@ -51,6 +76,7 @@ namespace oxygine
 		void init(int w, int h, TextureFormat tf, bool renderTarget = false);
 		void init(const ImageData &src, bool sysMemCopy);
 		void release();
+		void invalidate();
 
 		ImageData lock(lock_flags, const Rect *src);
 		void unlock();

oxygine/src/core/Object.cpp

@@ -70,7 +70,7 @@ namespace oxygine
 
 	ObjectBase::ObjectBase(const ObjectBase &src):__id(0), __name(0)
 	{
-#ifdef OX_DEBUG
+#ifdef OXYGINE_DEBUG_OBJECTS
 		{
 			MutexAutoLock m(mutexDebugList);
 			__objects.push_back(this);
@@ -93,7 +93,7 @@ namespace oxygine
 
 	ObjectBase::ObjectBase(bool assignID):__userData(0), __name(0), __id(0)
 	{
-#ifdef OX_DEBUG
+#ifdef OXYGINE_DEBUG_OBJECTS
 		{
 			MutexAutoLock m(mutexDebugList);
 			__objects.push_back(this);
@@ -128,7 +128,7 @@ namespace oxygine
 
 	void ObjectBase::__removeFromDebugList(ObjectBase *base)
 	{
-#ifdef OX_DEBUG
+#ifdef OXYGINE_DEBUG_OBJECTS
 		{
 			MutexAutoLock m(mutexDebugList);
 			createdObjects::iterator i = std::find(__objects.begin(), __objects.end(), base);
@@ -157,7 +157,7 @@ namespace oxygine
 
 	void ObjectBase::dumpCreatedObjects()
 	{
-#ifdef OX_DEBUG
+#ifdef OXYGINE_DEBUG_OBJECTS
 		MutexAutoLock m(mutexDebugList);
 
 		log::messageln("\n\n\nallocated objects:");

oxygine/src/core/Object.h

@@ -8,7 +8,7 @@ namespace oxygine
 {
 	using namespace std;
 
-#define OBJECT_POOL_ALLOCATOR 0
+//#define OBJECT_POOL_ALLOCATOR 0
 
 	class PoolObject
 	{

oxygine/src/core/Renderer.cpp

@@ -230,7 +230,7 @@ namespace oxygine
 	
 	bool _showTexel2PixelErrors = false;
 
-#ifdef _DEBUG
+#ifdef OXYGINE_DEBUG_T2P
 	void Renderer::showTexel2PixelErrors(bool show)
 	{
 		_showTexel2PixelErrors = show;
@@ -309,7 +309,7 @@ namespace oxygine
 			vertexPCT2 v[4];
 			fillQuadT(v, srcRect, destRect, _transform, color);		
 
-#ifdef _DEBUG
+#ifdef OXYGINE_DEBUG_T2P
 			if (b.base != white && _showTexel2PixelErrors)
 			{
 				Matrix vp = _view * _proj;

oxygine/src/core/Renderer.h

@@ -183,7 +183,7 @@ namespace oxygine
 
 
 		//debug utils
-#ifdef _DEBUG
+#ifdef OXYGINE_DEBUG_T2P
 		static void showTexel2PixelErrors(bool show);
 #endif
 

oxygine/src/core/ShaderProgram.h

@@ -10,6 +10,7 @@ namespace oxygine
 	{
 	public:
 		virtual void bind() = 0;
+		virtual void invalidate() = 0;
 
 		virtual unsigned int getID() const = 0;
 

oxygine/src/core/VideoDriver.h

@@ -77,6 +77,8 @@ namespace oxygine
 		static IVideoDriver *instance;
 		virtual ~IVideoDriver(){}
 
+		virtual void restore() = 0;
+
 		virtual spNativeTexture createTexture() = 0;
 
 		virtual void begin(const Matrix &proj, const Matrix &view, const Rect &viewport, const Color *color) = 0;				
@@ -117,6 +119,8 @@ namespace oxygine
 		void setScissorRect(const Rect *);
 		void setDefaultSettings();
 		void setRenderTarget(spNativeTexture);
+
+		void restore(){}
 	};
 
 }

oxygine/src/core/gl/NativeTextureGLES.cpp

@@ -114,7 +114,6 @@ namespace oxygine
 
 		glPixel p = SurfaceFormat2GL(tf);
 		glTexImage2D(GL_TEXTURE_2D, 0, p.format, w, h, 0, p.format, p.type, 0);
-
 		
 		if (rt)
 		{
@@ -208,6 +207,14 @@ namespace oxygine
 			glDeleteFramebuffers(1, &_fbo);		
 			_fbo = 0;
 		}
+
+		unreg();
+	}
+
+	void NativeTextureGLES::invalidate()
+	{
+		_id = 0;
+		_fbo = 0;
 	}
 
 	void NativeTextureGLES::swap(NativeTexture *)

oxygine/src/core/gl/NativeTextureGLES.h

@@ -13,6 +13,7 @@ namespace oxygine
 		void init(int w, int h, TextureFormat tf, bool renderTarget);
 		void init(const ImageData &src, bool sysMemCopy);
 		void release();
+		void invalidate();
 		void swap(NativeTexture *) ;
 
 		nativeTextureHandle	getHandle() const;
@@ -30,6 +31,7 @@ namespace oxygine
 		void apply(const Rect *rect = 0);
 
 	protected:
+		void* _getRestorableObject(){return this;}
 		friend class VideoDriverGLES11;
 		friend class VideoDriverGLES20;
 		NativeTextureGLES();

oxygine/src/core/gl/VideoDriverGL.cpp

@@ -68,6 +68,7 @@ namespace oxygine
 
 	void VideoDriverGL::_begin(const Rect &viewport, const Color *clearColor)
 	{
+	//	log::messageln("begin %d %d %d %d", viewport.pos.x, viewport.pos.y, viewport.size.x, viewport.size.y);
 		glViewport(viewport.getX(), viewport.getY(), viewport.getWidth(), viewport.getHeight());
 		glDisable(GL_SCISSOR_TEST);
 		if (clearColor)

oxygine/src/core/gl/VideoDriverGLES11.cpp

@@ -92,6 +92,8 @@ namespace oxygine
 
 	void VideoDriverGLES11::setDefaultSettings()
 	{
+		_blend = blend_disabled;
+
 		glDisable(GL_ALPHA_TEST);
 
 		glDisable(GL_DEPTH_TEST);

oxygine/src/core/gl/VideoDriverGLES20.cpp

@@ -16,6 +16,17 @@
 
 namespace oxygine
 {	
+	ShaderProgramGL::ShaderProgramGL():_program(0)
+	{
+
+	}
+
+	ShaderProgramGL::~ShaderProgramGL()
+	{
+		if (_program)
+			glDeleteProgram(_program);
+	}
+
 	void printShaderInfoLog(GLuint shader)
 	{
 		GLint length = 0;
@@ -24,7 +35,8 @@ namespace oxygine
 		{
 			char* buffer = (char*)malloc( sizeof(char) * length ) ;
 			glGetShaderInfoLog(shader, length, NULL, buffer);
-			log::error("%s", buffer);
+			if (buffer[0])
+				log::error("%s", buffer);
 			free(buffer);
 
 			GLint success;
@@ -48,16 +60,34 @@ namespace oxygine
 		_data.data.push_back(0);
 	}
 
-	UberShaderProgram::~UberShaderProgram()
+	void UberShaderProgram::releaseShaders()
 	{
 		for (int i = 0; i < SIZE; ++i)
 		{
 			shader &s = _shaders[i];
 			delete s.program;
+			s.program = 0;
 		}
 	}
 
+	UberShaderProgram::~UberShaderProgram()
+	{
+		releaseShaders();
+	}
 
+	void UberShaderProgram::restore()
+	{
+		for (int i = 0; i < SIZE; ++i)
+		{
+			shader &s = _shaders[i];
+			if (s.program)
+			{
+				s.program->invalidate();
+				delete s.program;
+				s.program = 0;
+			}			
+		}
+	}
 
 	UberShaderProgram::shader *UberShaderProgram::getShaderProgram(int flags)
 	{
@@ -181,6 +211,12 @@ namespace oxygine
 		glUseProgram(0);
 	}
 
+	void VideoDriverGLES20::restore()
+	{
+		_us.restore();
+		setDefaultSettings();		
+	}
+
 	spNativeTexture VideoDriverGLES20::createTexture()
 	{
 		return new NativeTextureGLES;
@@ -328,6 +364,8 @@ namespace oxygine
 
 	void VideoDriverGLES20::setDefaultSettings()
 	{
+		_currentProgram = 0;
+		_blend = blend_default;
 		glDisable(GL_DEPTH_TEST);
 		glDepthMask(GL_FALSE);
 		glCullFace(GL_FRONT_AND_BACK);

oxygine/src/core/gl/VideoDriverGLES20.h

@@ -9,8 +9,8 @@ namespace oxygine
 	class ShaderProgramGL: public ShaderProgram
 	{
 	public:
-		ShaderProgramGL():_program(0){}
-		~ShaderProgramGL(){}
+		ShaderProgramGL();
+		~ShaderProgramGL();
 
 		void init(GLuint p)
 		{
@@ -27,6 +27,11 @@ namespace oxygine
 			glUseProgram(_program);
 		}
 
+		void invalidate()
+		{
+			_program = 0;
+		}
+
 		void setUniform(const char *id, const Vector4 *v, int num)
 		{
 			int p = glGetUniformLocation(_program, id);
@@ -72,6 +77,8 @@ namespace oxygine
 		UberShaderProgram(const file::buffer &baseShader, const char *prepend="", const char *append = "");
 		~UberShaderProgram();
 
+		void restore();
+
 		void setShaderUniformsCallback(ShaderUniformsCallback cb){_cb = cb;}
 
 		ShaderUniformsCallback	getShaderUniformsCallback() const {return _cb;}
@@ -82,6 +89,8 @@ namespace oxygine
 		file::buffer _data;
 		ShaderUniformsCallback _cb;		
 
+		void releaseShaders();
+
 		unsigned int createShader(unsigned int type, const char* data, const char *prepend, const char *append);
 		unsigned int createProgram(int vs, int fs, const VertexDeclarationGL *decl);
 	};
@@ -93,6 +102,8 @@ namespace oxygine
 		VideoDriverGLES20();
 		~VideoDriverGLES20();
 
+		void restore();
+
 		spNativeTexture createTexture();
 		const file::buffer& getShaderBody() const {return _shaderBody;}
 

oxygine/src/core/log.cpp

@@ -9,15 +9,15 @@
 
 #if defined(ANDROID)
 #include <android/log.h>
-#define  LOG_TAG    "SDL"
-#define  LOGD(...)  __android_log_write(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+#define  LOG_TAG    "oxygine"
+#define  LOGD(str)  __android_log_write(ANDROID_LOG_DEBUG, LOG_TAG, str)
 
 #else
 #ifdef WIN32
 #include <Windows.h>
-#define LOGD(...) OutputDebugStringA(__VA_ARGS__)
+#define LOGD(str) OutputDebugStringA(str)
 #else
-#define LOGD(...) printf(__VA_ARGS__)
+#define LOGD(str) fputs(str, stdout)
 #endif
 #endif
 

oxygine/src/core/oxygine.cpp

@@ -4,13 +4,13 @@
 #include "log.h"
 #include "winnie_alloc/winnie_alloc.h"
 #include "VideoDriver.h"
-
+#include "res/CreateResourceContext.h"
 #include "res/Resources.h"
 
 #include "res/ResBuffer.h"
 #include "res/ResFontBM.h"
 #include "res/ResAtlas.h"
-
+#include "MemoryTexture.h"
 #include "PointerState.h"
 #include "Input.h"
 
@@ -197,6 +197,25 @@ namespace oxygine
 #endif
 	namespace core
 	{
+		void lostContext()
+		{
+			return;
+			log::messageln("lost context");
+#if 1
+			SDL_GL_DeleteContext(_context);
+			_context = SDL_GL_CreateContext(_window);
+			initGLExtensions();
+#endif			
+
+			IVideoDriver::instance->restore();
+			Renderer::initialize();			
+
+			Event ev(RootActor::LOST_CONTEXT);
+			getRoot()->dispatchEvent(&ev);
+
+			Restorable::restoreAll(); 
+		}
+
 		void init(init_desc *desc_ptr)
 		{
 			log::messageln("initialize oxygine");
@@ -275,8 +294,7 @@ namespace oxygine
 
 
 	#ifndef USE_EGL
-			SDL_GLContext context = SDL_GL_CreateContext(_window);
-			_context = context;
+			_context = SDL_GL_CreateContext(_window);
 
 			initGLExtensions();
 	#else
@@ -412,15 +430,8 @@ namespace oxygine
 		}
 #endif
 
-		bool update()
+		void checkGLError()
 		{
-			Renderer::statsPrev = Renderer::statsCurrent;
-			Renderer::statsCurrent = Renderer::Stats();
-
-	#ifdef __S3E__
-			IwGLSwapBuffers();
-
-			/* Check for error conditions. */
 			int gl_error = glGetError();
 			if (gl_error != GL_NO_ERROR)
 			{
@@ -430,7 +441,19 @@ namespace oxygine
 					exit(0);
 				}
 			}
+		}
+
+		bool update()
+		{
+			Renderer::statsPrev = Renderer::statsCurrent;
+			Renderer::statsCurrent = Renderer::Stats();
+
+			
 
+	#ifdef __S3E__
+			IwGLSwapBuffers();
+
+			checkGLError();
 
 			s3eDeviceYield(0);
 			s3eKeyboardUpdate();
@@ -483,9 +506,14 @@ namespace oxygine
 						if (focus != newFocus)
 						{
 							focus = newFocus;
-							Event ev(focus ? RootActor::ACTIVATE : RootActor::DEACTIVATE);
-							getRoot()->dispatchEvent(&ev);
 							log::messageln("focus: %d", (int)focus);
+							Event ev(focus ? RootActor::ACTIVATE : RootActor::DEACTIVATE);
+							if (getRoot())
+								getRoot()->dispatchEvent(&ev);
+							if (focus)
+							{
+								lostContext();
+							}							
 						}
 						//log::messageln("SDL_SYSWMEVENT %d", (int)event.window.event);
 						break;
@@ -545,8 +573,14 @@ namespace oxygine
 #else
 			//if (isActive())
 			{
-				SDL_GL_MakeCurrent(_window, _context);
+				int status = SDL_GL_MakeCurrent(_window, _context);
+				if (status)
+				{
+					log::error("SDL_GL_MakeCurrent(): %s", SDL_GetError());
+				}
 				SDL_GL_SwapWindow(_window);
+
+				checkGLError();
 			}
 
 #endif

oxygine/src/core/oxygine.h

@@ -39,7 +39,7 @@ namespace oxygine
 	{
 		if (!ptr)
 			return 0;
-#ifdef OX_DEBUG
+#ifdef OXYGINE_DEBUG_SAFECAST
 		dest cast = dynamic_cast<dest>(ptr);
 		OX_ASSERT(cast && "can't cast pointer");
 		return cast;
@@ -52,7 +52,7 @@ namespace oxygine
 	{
 		if (!p)
 			return 0;
-#ifdef OX_DEBUG
+#ifdef OXYGINE_DEBUG_SAFECAST
 		intrusive_ptr<T> t = dynamic_cast<T *>(p.get());
 		OX_ASSERT(t && "can't cast pointer");
 #endif

oxygine/src/dev_tools/TreeInspectorPreview.h

@@ -34,6 +34,7 @@ namespace oxygine
 		{
 
 		}
+
 		int getMaxVertices() const
 		{
 			return IVideoDriver::instance->getMaxVertices();

oxygine/src/oxygine_include.h

@@ -21,15 +21,22 @@
 
 
 #ifndef OX_DEBUG
-	#define USE_MEMORY_POOL
-	#define OBJECT_POOL_ALLOCATOR
-#else	
+	#define USE_MEMORY_POOL 1
+	#define OBJECT_POOL_ALLOCATOR 1
 #endif
 
+#if OX_DEBUG
+	#define OXYGINE_DEBUG_OBJECTS 1
+	#define OXYGINE_DEBUG_T2P 1
+	#define OXYGINE_DEBUG_SAFECAST 1
+#endif
 
+#define OXYGINE_ASSERT2LOG 1
 
+#if OXYGINE_ASSERT2LOG
 #define OX_ASSERT(x) if (!(x)) oxygine::log::error("Assert! %d %s", __LINE__, __FILE__); (assert(x))
-#define OX_LOG(format, args) {}
-
+#else
+#define OX_ASSERT(x) (assert(x))
+#endif
 
 #endif

oxygine/src/res/CreateResourceContext.cpp

@@ -0,0 +1,31 @@
+#pragma once
+#include "CreateResourceContext.h"
+#include "core/NativeTexture.h"
+#include "MemoryTexture.h"
+
+namespace oxygine
+{	
+	RestoreResourcesContext RestoreResourcesContext::instance;
+	void RestoreResourcesContext::createTexture(spMemoryTexture src, spNativeTexture dest)
+	{
+		dest->invalidate();
+		dest->init(src->lock(), false);
+	}
+
+	bool RestoreResourcesContext::isNeedProceed(spNativeTexture t)
+	{
+		return t->getHandle() != 0;
+	}
+
+	SingleThreadResourcesContext SingleThreadResourcesContext::instance;
+
+	void SingleThreadResourcesContext::createTexture(spMemoryTexture src, spNativeTexture dest)
+	{
+		dest->init(src->lock(), false);
+	}
+
+	bool SingleThreadResourcesContext::isNeedProceed(spNativeTexture t)
+	{
+		return t->getHandle() == 0;
+	}
+}

oxygine/src/res/CreateResourceContext.h

@@ -2,10 +2,12 @@
 #include "oxygine_include.h"
 #include <string>
 #include "pugixml/pugixml.hpp"
-
+#include "core/Object.h"
 
 namespace oxygine
 {
+	using namespace std;
+
 	class Resources;
 	/**internal class*/
 	class CreateResourceContext//todo rename
@@ -34,6 +36,24 @@ namespace oxygine
 	{
 	public:
 		virtual ~LoadResourcesContext(){}
+
 		virtual void createTexture(spMemoryTexture src, spNativeTexture dest) = 0;
+		virtual bool isNeedProceed(spNativeTexture t) = 0;
+	};	
+
+	class SingleThreadResourcesContext: public LoadResourcesContext
+	{
+	public:
+		static SingleThreadResourcesContext instance;
+		void createTexture(spMemoryTexture src, spNativeTexture dest);
+		bool isNeedProceed(spNativeTexture t);
+	};
+
+	class RestoreResourcesContext: public LoadResourcesContext
+	{
+	public:
+		static RestoreResourcesContext instance;
+		void createTexture(spMemoryTexture src, spNativeTexture dest);
+		bool isNeedProceed(spNativeTexture t);
 	};
 }

oxygine/src/res/ResAtlas.cpp

@@ -458,14 +458,30 @@ namespace oxygine
 		LOGD("atlas size: %d %d", im.w, im.h);
 
 		//Object::dumpCreatedObjects();
-		if (load_context)			
-		{
-			load_context->createTexture(mt, nt);
-		}
-		else
+		load_context->createTexture(mt, nt);
+	}
+
+	void ResAtlas::_restore(Restorable *r, void *)
+	{
+		NativeTexture *texture = (NativeTexture *)r->_getRestorableObject();
+
+		for (atlasses::iterator i = _atlasses.begin(); i != _atlasses.end(); ++i)
 		{
-			nt->init(mt->lock(), false);
-		}
+			atlas &atl = *i;
+			if(atl.base.get() == texture)
+			{
+				load_texture(atl.base_path, atl.base, &RestoreResourcesContext::instance);
+				atl.base->reg(CLOSURE(this, &ResAtlas::_restore), 0);
+				break;
+			}
+
+			if(atl.alpha.get() == texture)
+			{
+				load_texture(atl.alpha_path, atl.alpha, &RestoreResourcesContext::instance);
+				atl.alpha->reg(CLOSURE(this, &ResAtlas::_restore), 0);
+				break;
+			}
+		}		
 	}
 
 	void ResAtlas::_load(LoadResourcesContext *load_context)
@@ -473,12 +489,17 @@ namespace oxygine
 		for (atlasses::iterator i = _atlasses.begin(); i != _atlasses.end(); ++i)
 		{
 			atlas &atl = *i;
-			if (atl.base->getHandle())
+			if (!load_context->isNeedProceed(atl.base))
 				continue;
 			
 			load_texture(atl.base_path, atl.base, load_context);
+			atl.base->reg(CLOSURE(this, &ResAtlas::_restore), 0);
+
 			if (atl.alpha)
+			{
 				load_texture(atl.alpha_path, atl.alpha, load_context);
+				atl.alpha->reg(CLOSURE(this, &ResAtlas::_restore), 0);
+			}
 		}
 	}
 
@@ -487,11 +508,11 @@ namespace oxygine
 		for (atlasses::iterator i = _atlasses.begin(); i != _atlasses.end(); ++i)
 		{
 			atlas &atl = *i;
-			if (atl.base)
+			if (atl.base)					
 				atl.base->release();
+			
 			if (atl.alpha)
 				atl.alpha->release();
 		}
 	}
-	
 }

oxygine/src/res/ResAtlas.h

@@ -39,6 +39,8 @@ namespace oxygine
 		const atlas& getAtlas(int i) const {return _atlasses[i];}
 
 	protected:
+		void _restore(Restorable *r, void *user);
+
 		void _load(LoadResourcesContext *);
 		void _unload();
 

oxygine/src/res/ResFontBM.cpp

@@ -75,6 +75,34 @@ namespace oxygine
 		_pages.clear();
 	}
 
+	void ResFontBM::_restore(Restorable *r, void*)
+	{
+		void *object = r->_getRestorableObject();
+		for (pages::iterator i = _pages.begin(); i != _pages.end(); ++i)
+		{
+			const page &p = *i;
+			if (p.texture.get() == object)
+			{
+				_loadPage(p, &RestoreResourcesContext::instance);
+			}
+		}
+	}
+
+	void ResFontBM::_loadPage(const page &p, LoadResourcesContext *load_context)
+	{
+		if (!load_context->isNeedProceed(p.texture))
+			return;
+
+		spMemoryTexture mt = new MemoryTexture;
+
+		file::buffer bf;
+		file::read(p.file.c_str(), bf);
+
+		mt->init(bf, !_premultipliedAlpha, _format);		
+		load_context->createTexture(mt, p.texture);
+		p.texture->reg(CLOSURE(this, &ResFontBM::_restore), 0);
+	}
+
 	void ResFontBM::_load(LoadResourcesContext *load_context)
 	{
 		OX_ASSERT(!_pages.empty());
@@ -84,19 +112,8 @@ namespace oxygine
 		for (pages::iterator i = _pages.begin(); i != _pages.end(); ++i)
 		{
 			const page &p = *i;
-			if (p.texture->getHandle())
-				continue;
-
-			spMemoryTexture mt = new MemoryTexture;
-
-			file::buffer bf;
-			file::read(p.file.c_str(), bf);
-
-			mt->init(bf, !_premultipliedAlpha, _format);
-			if (load_context)
-				load_context->createTexture(mt, p.texture);
-			else
-				p.texture->init(mt->lock(), false);
+			_loadPage(p, load_context);			
+			
 		}		
 	}
 

oxygine/src/res/ResFontBM.h

@@ -8,6 +8,7 @@ namespace oxygine
 {
 	class Resources;
 	class CreateResourceContext;
+	class Restorable;
 
 	DECLARE_SMART(NativeTexture, spNativeTexture);
 
@@ -28,17 +29,21 @@ namespace oxygine
 
 		Font *getFont(const char *name = 0, int size = 0) const;
 
-	private:		
-		void _load(LoadResourcesContext *);
-		void _unload();
-		void _createFont(CreateResourceContext *context, bool sd, bool bmc);
-
+	private:
 		struct page
 		{
 			string file;
 			spNativeTexture texture;
 		};
 
+		void _loadPage(const page &p, LoadResourcesContext *);
+		void _load(LoadResourcesContext *);
+		void _unload();
+		void _restore(Restorable *, void*);
+		void _createFont(CreateResourceContext *context, bool sd, bool bmc);
+
+		
+
 		typedef vector<page> pages;
 		pages _pages;
 		Font *_font;

oxygine/src/res/Resource.cpp

@@ -1,6 +1,7 @@
 #include "Resource.h"
 #include <stdio.h>
 #include "utils/stringUtils.h"
+#include "CreateResourceContext.h"
 
 namespace oxygine
 {
@@ -16,6 +17,9 @@ namespace oxygine
 
 	void Resource::load(LoadResourcesContext *context /* = 0 */)
 	{
+		if (!context)
+			context = &SingleThreadResourcesContext::instance;
+
 		if (_loadCounter == 0)
 			_load(context);
 

oxygine/src/res/Resource.h

@@ -9,6 +9,7 @@ namespace oxygine
 	class Resources;
 	class Mem2Native;
 
+	class LoadResourcesContext;
 	class LoadResourcesContext;
 
 	class Resource: public ObjectBase

oxygine/src/res/Resources.h

@@ -21,8 +21,7 @@ namespace oxygine
 	class ResAnim;
 
 	class CreateResourceContext;
-	class LoadResourcesContext;
-
+	class LoadResourcesContext; 
 
 
 	class Resources

oxygine/src/text_utils/Node.cpp

@@ -146,10 +146,10 @@ namespace oxygine
 		{
 			if (!_data.empty())
 			{
-				size_t i = 0;
+				int i = 0;
 				Font *font = rd.getStyle().font;
 
-				while (i != _data.size())
+				while (i != (int)_data.size())
 				{
 					Symbol &s = _data[i];
 					//wchar_t c = s.c;

oxygine/system_data/data/system/fonts/system.fnt

@@ -1,164 +0,0 @@
-<?xml version="1.0"?>
-<font>
-  <info face="Arial" size="-12" bold="0" italic="0" charset="" unicode="1" stretchH="100" smooth="1" aa="1" padding="0,0,0,0" spacing="1,1" outline="0"/>
-  <common lineHeight="15" base="12" scaleW="128" scaleH="64" pages="1" packed="0" alphaChnl="1" redChnl="0" greenChnl="0" blueChnl="0"/>
-  <pages>
-    <page id="0" file="system_0.png" />
-  </pages>
-  <chars count="95">
-    <char id="32" x="53" y="39" width="1" height="1" xoffset="0" yoffset="12" xadvance="3" page="0" chnl="15" />
-    <char id="33" x="23" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="34" x="32" y="40" width="3" height="3" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="35" x="0" y="13" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="36" x="48" y="0" width="5" height="10" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="37" x="70" y="0" width="9" height="9" xoffset="1" yoffset="3" xadvance="11" page="0" chnl="15" />
-    <char id="38" x="8" y="13" width="7" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="39" x="36" y="40" width="1" height="3" xoffset="1" yoffset="3" xadvance="2" page="0" chnl="15" />
-    <char id="40" x="12" y="0" width="3" height="11" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="41" x="16" y="0" width="3" height="11" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="42" x="26" y="42" width="5" height="4" xoffset="0" yoffset="3" xadvance="5" page="0" chnl="15" />
-    <char id="43" x="120" y="30" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="44" x="126" y="30" width="1" height="3" xoffset="1" yoffset="11" xadvance="3" page="0" chnl="15" />
-    <char id="45" x="49" y="39" width="3" height="1" xoffset="0" yoffset="8" xadvance="4" page="0" chnl="15" />
-    <char id="46" x="55" y="39" width="1" height="1" xoffset="1" yoffset="11" xadvance="3" page="0" chnl="15" />
-    <char id="47" x="15" y="33" width="3" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="48" x="0" y="33" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="49" x="11" y="33" width="3" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="50" x="20" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="51" x="26" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="52" x="32" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="53" x="38" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="54" x="110" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="55" x="44" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="56" x="50" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="57" x="62" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="58" x="112" y="30" width="1" height="7" xoffset="1" yoffset="5" xadvance="3" page="0" chnl="15" />
-    <char id="59" x="125" y="0" width="1" height="9" xoffset="1" yoffset="5" xadvance="3" page="0" chnl="15" />
-    <char id="60" x="6" y="43" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="61" x="12" y="43" width="6" height="4" xoffset="0" yoffset="6" xadvance="7" page="0" chnl="15" />
-    <char id="62" x="0" y="43" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="63" x="80" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="64" x="0" y="0" width="11" height="12" xoffset="1" yoffset="3" xadvance="12" page="0" chnl="15" />
-    <char id="65" x="80" y="0" width="9" height="9" xoffset="-1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="66" x="104" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="67" x="40" y="11" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="68" x="88" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="69" x="0" y="23" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="70" x="122" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="71" x="109" y="0" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="72" x="56" y="11" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="73" x="25" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="74" x="14" y="23" width="5" height="9" xoffset="0" yoffset="3" xadvance="6" page="0" chnl="15" />
-    <char id="75" x="64" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="76" x="118" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="77" x="72" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="78" x="80" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="79" x="32" y="12" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="80" x="111" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="81" x="40" y="0" width="7" height="10" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="82" x="100" y="0" width="8" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="83" x="7" y="23" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="84" x="48" y="11" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="85" x="96" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="86" x="90" y="0" width="9" height="9" xoffset="-1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="87" x="58" y="0" width="11" height="9" xoffset="0" yoffset="3" xadvance="11" page="0" chnl="15" />
-    <char id="88" x="24" y="12" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="89" x="16" y="12" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="90" x="117" y="0" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="91" x="35" y="0" width="2" height="11" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="92" x="19" y="33" width="3" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="93" x="32" y="0" width="2" height="11" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="94" x="114" y="30" width="5" height="5" xoffset="0" yoffset="3" xadvance="5" page="0" chnl="15" />
-    <char id="95" x="41" y="40" width="7" height="1" xoffset="0" yoffset="13" xadvance="7" page="0" chnl="15" />
-    <char id="96" x="38" y="40" width="2" height="2" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="97" x="97" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="98" x="56" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="99" x="103" y="30" width="4" height="7" xoffset="1" yoffset="5" xadvance="6" page="0" chnl="15" />
-    <char id="100" x="92" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="101" x="85" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="102" x="6" y="33" width="4" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="103" x="68" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="104" x="74" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="105" x="27" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="106" x="24" y="0" width="3" height="11" xoffset="-1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="107" x="86" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="6" page="0" chnl="15" />
-    <char id="108" x="125" y="10" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="109" x="39" y="32" width="9" height="7" xoffset="1" yoffset="5" xadvance="11" page="0" chnl="15" />
-    <char id="110" x="61" y="31" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="111" x="73" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="112" x="98" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="113" x="104" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="114" x="108" y="30" width="3" height="7" xoffset="1" yoffset="5" xadvance="4" page="0" chnl="15" />
-    <char id="115" x="91" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="116" x="54" y="0" width="3" height="10" xoffset="0" yoffset="2" xadvance="3" page="0" chnl="15" />
-    <char id="117" x="49" y="31" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="118" x="55" y="31" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="119" x="29" y="32" width="9" height="7" xoffset="0" yoffset="5" xadvance="9" page="0" chnl="15" />
-    <char id="120" x="67" y="31" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="121" x="116" y="20" width="5" height="9" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="122" x="79" y="30" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="123" x="20" y="0" width="3" height="11" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="124" x="38" y="0" width="1" height="11" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="125" x="28" y="0" width="3" height="11" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="126" x="19" y="43" width="6" height="4" xoffset="1" yoffset="6" xadvance="7" page="0" chnl="15" />
-  </chars>
-  <kernings count="57">
-    <kerning first="32" second="65" amount="-1" />
-    <kerning first="121" second="46" amount="-1" />
-    <kerning first="121" second="44" amount="-1" />
-    <kerning first="119" second="46" amount="-1" />
-    <kerning first="119" second="44" amount="-1" />
-    <kerning first="118" second="46" amount="-1" />
-    <kerning first="118" second="44" amount="-1" />
-    <kerning first="114" second="46" amount="-1" />
-    <kerning first="114" second="44" amount="-1" />
-    <kerning first="89" second="118" amount="-1" />
-    <kerning first="49" second="49" amount="-1" />
-    <kerning first="65" second="32" amount="-1" />
-    <kerning first="65" second="84" amount="-1" />
-    <kerning first="65" second="86" amount="-1" />
-    <kerning first="89" second="117" amount="-1" />
-    <kerning first="65" second="89" amount="-1" />
-    <kerning first="89" second="113" amount="-1" />
-    <kerning first="89" second="112" amount="-1" />
-    <kerning first="89" second="111" amount="-1" />
-    <kerning first="89" second="101" amount="-1" />
-    <kerning first="70" second="44" amount="-1" />
-    <kerning first="70" second="46" amount="-1" />
-    <kerning first="70" second="65" amount="-1" />
-    <kerning first="89" second="97" amount="-1" />
-    <kerning first="76" second="84" amount="-1" />
-    <kerning first="76" second="86" amount="-1" />
-    <kerning first="76" second="87" amount="-1" />
-    <kerning first="76" second="89" amount="-1" />
-    <kerning first="89" second="65" amount="-1" />
-    <kerning first="89" second="58" amount="-1" />
-    <kerning first="89" second="46" amount="-2" />
-    <kerning first="80" second="44" amount="-2" />
-    <kerning first="80" second="46" amount="-2" />
-    <kerning first="80" second="65" amount="-1" />
-    <kerning first="89" second="45" amount="-1" />
-    <kerning first="89" second="44" amount="-2" />
-    <kerning first="87" second="46" amount="-1" />
-    <kerning first="87" second="44" amount="-1" />
-    <kerning first="86" second="111" amount="-1" />
-    <kerning first="84" second="44" amount="-1" />
-    <kerning first="84" second="45" amount="-1" />
-    <kerning first="84" second="46" amount="-1" />
-    <kerning first="84" second="58" amount="-1" />
-    <kerning first="86" second="101" amount="-1" />
-    <kerning first="84" second="65" amount="-1" />
-    <kerning first="86" second="97" amount="-1" />
-    <kerning first="84" second="97" amount="-1" />
-    <kerning first="84" second="99" amount="-1" />
-    <kerning first="84" second="101" amount="-1" />
-    <kerning first="86" second="65" amount="-1" />
-    <kerning first="84" second="111" amount="-1" />
-    <kerning first="86" second="46" amount="-1" />
-    <kerning first="84" second="115" amount="-1" />
-    <kerning first="86" second="45" amount="-1" />
-    <kerning first="84" second="119" amount="-1" />
-    <kerning first="84" second="121" amount="-1" />
-    <kerning first="86" second="44" amount="-1" />
-  </kernings>
-</font>

oxygine/system_data/data/system/res.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<resources>
-	<set path = "system/anims" />
-	<atlas>
-		<image file="tree.png"/>
-		<image file="finger.png"/>
-		<image file="t2p.png"/>
-		<image file="checkbox.png" rows="2"/>
-		<image file="checker.png"/>
-		<image file="remove.png"/>
-		<image file="images.png"/>
-	</atlas>
-	
-	<set path = "system/fonts" />
-	<font file="system.fnt" version="7"/>	
-</resources>

oxygine/system_data/data/system/res.xml.ox/meta.xml

@@ -1 +0,0 @@
-<resources><atlas><image file="1_0.png" format="r8g8b8a8" h="128" w="256"/><frames fs="1,1,32,32,1.000000">0,0,67,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,66,1,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,66,35,0,0,32,32;</frames><frames fs="1,2,16,16,1.000000">0,0,101,1,0,15,15;0,17,101,1,1,15,14;</frames><frames fs="1,1,64,64,1.000000">0,0,1,0,0,64,64;</frames><frames fs="1,1,32,32,1.000000">0,66,69,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,100,1,0,0,32,32;</frames></atlas><font sf="1.0" size="12"/></resources>

oxygine/system_data/data/system/shader.glsl

@@ -1,77 +0,0 @@
-//shared data between vs/ps
-varying lowp vec4 result_color;
-varying mediump vec2 result_uv;
-varying mediump vec2 result_uv2;
-
-#ifdef VS
-uniform mediump mat4 mat;
-attribute vec3 position;
-attribute vec4 color;
-attribute vec2 uv;
-attribute vec2 uv2;
-
-void program_main_vs()
-{
-	gl_Position = mat * vec4(position, 1.0); 
-
-	result_color = color;
-	result_uv = uv;
-#ifdef MASK
-	result_uv2 = uv2;
-#endif
-}
-
-#endif
-
-
-#ifdef PS
-uniform lowp vec4 clip_mask;
-uniform lowp sampler2D base_texture;
-uniform lowp sampler2D mask_texture;
-uniform lowp sampler2D alpha_texture;
-
-lowp vec4 get_base()
-{
-	lowp vec4 base = texture2D(base_texture, result_uv);	
-#ifdef SEPARATE_ALPHA
-	base.a = texture2D(alpha_texture, result_uv).r;	
-#endif
-
-#ifdef ALPHA_PREMULTIPLY
-	base.rgb = base.rgb * base.a;
-#endif
-
-#ifdef MODIFY_BASE
-	base = modify_base(base);
-#endif
-
-	return base;
-}
-
-lowp vec4 get_color()
-{
-	lowp vec4 base = get_base();
-
-
-#ifdef MASK
-	lowp vec2 uv2 = clamp(result_uv2, clip_mask.xy, clip_mask.zw);
-	lowp vec4 mask = texture2D(mask_texture, uv2);
-
-#ifdef SEPARATE_ALPHA
-	lowp float mask_alpha = mask.r;	
-#else
-	lowp float mask_alpha = mask.a;
-#endif
-
-	base = base * mask_alpha;
-#endif
-
-	return base * result_color;
-}
-
-
-void program_main_ps()
-{	
-	gl_FragColor = get_color();
-}
-#endif

oxygine/third_party/android/libjpeg/jconfig_linux.h

@@ -1,58 +0,0 @@
-/* jconfig.h.  Generated from jconfig.cfg by configure.  */
-/* jconfig.cfg --- source file edited by configure script */
-/* see jconfig.txt for explanations */
-#ifndef __JCONFIG_LINUX_H__
-#define __JCONFIG_LINUX_H__
-
-#define HAVE_PROTOTYPES 1
-#define HAVE_UNSIGNED_CHAR 1
-#define HAVE_UNSIGNED_SHORT 1
-/* #undef void */
-/* #undef const */
-/* #undef CHAR_IS_UNSIGNED */
-#define HAVE_STDDEF_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_LOCALE_H 1
-/* #undef NEED_BSD_STRINGS */
-/* #undef NEED_SYS_TYPES_H */
-/* #undef NEED_FAR_POINTERS */
-/* #undef NEED_SHORT_EXTERNAL_NAMES */
-/* Define this if you get warnings about undefined structures. */
-/* #undef INCOMPLETE_TYPES_BROKEN */
-
-/* Define "boolean" as unsigned char, not int, on Windows systems. */
-#ifdef _WIN32
-#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
-typedef unsigned char boolean;
-#endif
-#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
-#endif
-
-#ifdef JPEG_INTERNALS
-
-/* #undef RIGHT_SHIFT_IS_UNSIGNED */
-#define INLINE __inline__
-/* These are for configuring the JPEG memory manager. */
-/* #undef DEFAULT_MAX_MEM */
-/* #undef NO_MKTEMP */
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-/* #undef RLE_SUPPORTED */
-#define TARGA_SUPPORTED		/* Targa image file format */
-
-/* #undef TWO_FILE_COMMANDLINE */
-/* #undef NEED_SIGNAL_CATCHER */
-/* #undef DONT_USE_B_MODE */
-
-/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
-/* #undef PROGRESS_REPORT */
-
-#endif /* JPEG_CJPEG_DJPEG */
-
-#endif // __JCONFIG_LINUX_H__

oxygine/third_party/android/libjpeg/jconfig_win.h

@@ -1,49 +0,0 @@
-/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 95 or NT. */
-/* see jconfig.txt for explanations */
-#ifndef __JCONFIG_WIN_H__
-#define __JCONFIG_WIN_H__
-
-#define HAVE_PROTOTYPES
-#define HAVE_UNSIGNED_CHAR
-#define HAVE_UNSIGNED_SHORT
-/* #define void char */
-/* #define const */
-#undef CHAR_IS_UNSIGNED
-#define HAVE_STDDEF_H
-#define HAVE_STDLIB_H
-#undef NEED_BSD_STRINGS
-#undef NEED_SYS_TYPES_H
-#undef NEED_FAR_POINTERS	/* we presume a 32-bit flat memory model */
-#undef NEED_SHORT_EXTERNAL_NAMES
-#undef INCOMPLETE_TYPES_BROKEN
-
-/* Define "boolean" as unsigned char, not int, per Windows custom */
-#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
-typedef unsigned char boolean;
-#endif
-#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
-
-
-#ifdef JPEG_INTERNALS
-
-#undef RIGHT_SHIFT_IS_UNSIGNED
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED		/* Utah RLE image file format */
-#define TARGA_SUPPORTED		/* Targa image file format */
-
-#define TWO_FILE_COMMANDLINE	/* optional */
-#define USE_SETMODE		/* Microsoft has setmode() */
-#undef NEED_SIGNAL_CATCHER
-#undef DONT_USE_B_MODE
-#undef PROGRESS_REPORT		/* optional */
-
-#endif /* JPEG_CJPEG_DJPEG */
-
-#endif // __JCONFIG_WIN_H__

oxygine/third_party/macosx/libjpeg/jerror.h

@@ -1,291 +0,0 @@
-/*
- * jerror.h
- *
- * Copyright (C) 1994-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file defines the error and message codes for the JPEG library.
- * Edit this file to add new codes, or to translate the message strings to
- * some other language.
- * A set of error-reporting macros are defined too.  Some applications using
- * the JPEG library may wish to include this file to get the error codes
- * and/or the macros.
- */
-
-/*
- * To define the enum list of message codes, include this file without
- * defining macro JMESSAGE.  To create a message string table, include it
- * again with a suitable JMESSAGE definition (see jerror.c for an example).
- */
-#ifndef JMESSAGE
-#ifndef JERROR_H
-/* First time through, define the enum list */
-#define JMAKE_ENUM_LIST
-#else
-/* Repeated inclusions of this file are no-ops unless JMESSAGE is defined */
-#define JMESSAGE(code,string)
-#endif /* JERROR_H */
-#endif /* JMESSAGE */
-
-#ifdef JMAKE_ENUM_LIST
-
-typedef enum {
-
-#define JMESSAGE(code,string)	code ,
-
-#endif /* JMAKE_ENUM_LIST */
-
-JMESSAGE(JMSG_NOMESSAGE, "Bogus message code %d") /* Must be first entry! */
-
-/* For maintenance convenience, list is alphabetical by message code name */
-JMESSAGE(JERR_ARITH_NOTIMPL,
-	 "Sorry, there are legal restrictions on arithmetic coding")
-JMESSAGE(JERR_BAD_ALIGN_TYPE, "ALIGN_TYPE is wrong, please fix")
-JMESSAGE(JERR_BAD_ALLOC_CHUNK, "MAX_ALLOC_CHUNK is wrong, please fix")
-JMESSAGE(JERR_BAD_BUFFER_MODE, "Bogus buffer control mode")
-JMESSAGE(JERR_BAD_COMPONENT_ID, "Invalid component ID %d in SOS")
-JMESSAGE(JERR_BAD_DCT_COEF, "DCT coefficient out of range")
-JMESSAGE(JERR_BAD_DCTSIZE, "IDCT output block size %d not supported")
-JMESSAGE(JERR_BAD_HUFF_TABLE, "Bogus Huffman table definition")
-JMESSAGE(JERR_BAD_IN_COLORSPACE, "Bogus input colorspace")
-JMESSAGE(JERR_BAD_J_COLORSPACE, "Bogus JPEG colorspace")
-JMESSAGE(JERR_BAD_LENGTH, "Bogus marker length")
-JMESSAGE(JERR_BAD_LIB_VERSION,
-	 "Wrong JPEG library version: library is %d, caller expects %d")
-JMESSAGE(JERR_BAD_MCU_SIZE, "Sampling factors too large for interleaved scan")
-JMESSAGE(JERR_BAD_POOL_ID, "Invalid memory pool code %d")
-JMESSAGE(JERR_BAD_PRECISION, "Unsupported JPEG data precision %d")
-JMESSAGE(JERR_BAD_PROGRESSION,
-	 "Invalid progressive parameters Ss=%d Se=%d Ah=%d Al=%d")
-JMESSAGE(JERR_BAD_PROG_SCRIPT,
-	 "Invalid progressive parameters at scan script entry %d")
-JMESSAGE(JERR_BAD_SAMPLING, "Bogus sampling factors")
-JMESSAGE(JERR_BAD_SCAN_SCRIPT, "Invalid scan script at entry %d")
-JMESSAGE(JERR_BAD_STATE, "Improper call to JPEG library in state %d")
-JMESSAGE(JERR_BAD_STRUCT_SIZE,
-	 "JPEG parameter struct mismatch: library thinks size is %u, caller expects %u")
-JMESSAGE(JERR_BAD_VIRTUAL_ACCESS, "Bogus virtual array access")
-JMESSAGE(JERR_BUFFER_SIZE, "Buffer passed to JPEG library is too small")
-JMESSAGE(JERR_CANT_SUSPEND, "Suspension not allowed here")
-JMESSAGE(JERR_CCIR601_NOTIMPL, "CCIR601 sampling not implemented yet")
-JMESSAGE(JERR_COMPONENT_COUNT, "Too many color components: %d, max %d")
-JMESSAGE(JERR_CONVERSION_NOTIMPL, "Unsupported color conversion request")
-JMESSAGE(JERR_DAC_INDEX, "Bogus DAC index %d")
-JMESSAGE(JERR_DAC_VALUE, "Bogus DAC value 0x%x")
-JMESSAGE(JERR_DHT_INDEX, "Bogus DHT index %d")
-JMESSAGE(JERR_DQT_INDEX, "Bogus DQT index %d")
-JMESSAGE(JERR_EMPTY_IMAGE, "Empty JPEG image (DNL not supported)")
-JMESSAGE(JERR_EMS_READ, "Read from EMS failed")
-JMESSAGE(JERR_EMS_WRITE, "Write to EMS failed")
-JMESSAGE(JERR_EOI_EXPECTED, "Didn't expect more than one scan")
-JMESSAGE(JERR_FILE_READ, "Input file read error")
-JMESSAGE(JERR_FILE_WRITE, "Output file write error --- out of disk space?")
-JMESSAGE(JERR_FRACT_SAMPLE_NOTIMPL, "Fractional sampling not implemented yet")
-JMESSAGE(JERR_HUFF_CLEN_OVERFLOW, "Huffman code size table overflow")
-JMESSAGE(JERR_HUFF_MISSING_CODE, "Missing Huffman code table entry")
-JMESSAGE(JERR_IMAGE_TOO_BIG, "Maximum supported image dimension is %u pixels")
-JMESSAGE(JERR_INPUT_EMPTY, "Empty input file")
-JMESSAGE(JERR_INPUT_EOF, "Premature end of input file")
-JMESSAGE(JERR_MISMATCHED_QUANT_TABLE,
-	 "Cannot transcode due to multiple use of quantization table %d")
-JMESSAGE(JERR_MISSING_DATA, "Scan script does not transmit all data")
-JMESSAGE(JERR_MODE_CHANGE, "Invalid color quantization mode change")
-JMESSAGE(JERR_NOTIMPL, "Not implemented yet")
-JMESSAGE(JERR_NOT_COMPILED, "Requested feature was omitted at compile time")
-JMESSAGE(JERR_NO_BACKING_STORE, "Backing store not supported")
-JMESSAGE(JERR_NO_HUFF_TABLE, "Huffman table 0x%02x was not defined")
-JMESSAGE(JERR_NO_IMAGE, "JPEG datastream contains no image")
-JMESSAGE(JERR_NO_QUANT_TABLE, "Quantization table 0x%02x was not defined")
-JMESSAGE(JERR_NO_SOI, "Not a JPEG file: starts with 0x%02x 0x%02x")
-JMESSAGE(JERR_OUT_OF_MEMORY, "Insufficient memory (case %d)")
-JMESSAGE(JERR_QUANT_COMPONENTS,
-	 "Cannot quantize more than %d color components")
-JMESSAGE(JERR_QUANT_FEW_COLORS, "Cannot quantize to fewer than %d colors")
-JMESSAGE(JERR_QUANT_MANY_COLORS, "Cannot quantize to more than %d colors")
-JMESSAGE(JERR_SOF_DUPLICATE, "Invalid JPEG file structure: two SOF markers")
-JMESSAGE(JERR_SOF_NO_SOS, "Invalid JPEG file structure: missing SOS marker")
-JMESSAGE(JERR_SOF_UNSUPPORTED, "Unsupported JPEG process: SOF type 0x%02x")
-JMESSAGE(JERR_SOI_DUPLICATE, "Invalid JPEG file structure: two SOI markers")
-JMESSAGE(JERR_SOS_NO_SOF, "Invalid JPEG file structure: SOS before SOF")
-JMESSAGE(JERR_TFILE_CREATE, "Failed to create temporary file %s")
-JMESSAGE(JERR_TFILE_READ, "Read failed on temporary file")
-JMESSAGE(JERR_TFILE_SEEK, "Seek failed on temporary file")
-JMESSAGE(JERR_TFILE_WRITE,
-	 "Write failed on temporary file --- out of disk space?")
-JMESSAGE(JERR_TOO_LITTLE_DATA, "Application transferred too few scanlines")
-JMESSAGE(JERR_UNKNOWN_MARKER, "Unsupported marker type 0x%02x")
-JMESSAGE(JERR_VIRTUAL_BUG, "Virtual array controller messed up")
-JMESSAGE(JERR_WIDTH_OVERFLOW, "Image too wide for this implementation")
-JMESSAGE(JERR_XMS_READ, "Read from XMS failed")
-JMESSAGE(JERR_XMS_WRITE, "Write to XMS failed")
-JMESSAGE(JMSG_COPYRIGHT, JCOPYRIGHT)
-JMESSAGE(JMSG_VERSION, JVERSION)
-JMESSAGE(JTRC_16BIT_TABLES,
-	 "Caution: quantization tables are too coarse for baseline JPEG")
-JMESSAGE(JTRC_ADOBE,
-	 "Adobe APP14 marker: version %d, flags 0x%04x 0x%04x, transform %d")
-JMESSAGE(JTRC_APP0, "Unknown APP0 marker (not JFIF), length %u")
-JMESSAGE(JTRC_APP14, "Unknown APP14 marker (not Adobe), length %u")
-JMESSAGE(JTRC_DAC, "Define Arithmetic Table 0x%02x: 0x%02x")
-JMESSAGE(JTRC_DHT, "Define Huffman Table 0x%02x")
-JMESSAGE(JTRC_DQT, "Define Quantization Table %d  precision %d")
-JMESSAGE(JTRC_DRI, "Define Restart Interval %u")
-JMESSAGE(JTRC_EMS_CLOSE, "Freed EMS handle %u")
-JMESSAGE(JTRC_EMS_OPEN, "Obtained EMS handle %u")
-JMESSAGE(JTRC_EOI, "End Of Image")
-JMESSAGE(JTRC_HUFFBITS, "        %3d %3d %3d %3d %3d %3d %3d %3d")
-JMESSAGE(JTRC_JFIF, "JFIF APP0 marker: version %d.%02d, density %dx%d  %d")
-JMESSAGE(JTRC_JFIF_BADTHUMBNAILSIZE,
-	 "Warning: thumbnail image size does not match data length %u")
-JMESSAGE(JTRC_JFIF_EXTENSION,
-	 "JFIF extension marker: type 0x%02x, length %u")
-JMESSAGE(JTRC_JFIF_THUMBNAIL, "    with %d x %d thumbnail image")
-JMESSAGE(JTRC_MISC_MARKER, "Miscellaneous marker 0x%02x, length %u")
-JMESSAGE(JTRC_PARMLESS_MARKER, "Unexpected marker 0x%02x")
-JMESSAGE(JTRC_QUANTVALS, "        %4u %4u %4u %4u %4u %4u %4u %4u")
-JMESSAGE(JTRC_QUANT_3_NCOLORS, "Quantizing to %d = %d*%d*%d colors")
-JMESSAGE(JTRC_QUANT_NCOLORS, "Quantizing to %d colors")
-JMESSAGE(JTRC_QUANT_SELECTED, "Selected %d colors for quantization")
-JMESSAGE(JTRC_RECOVERY_ACTION, "At marker 0x%02x, recovery action %d")
-JMESSAGE(JTRC_RST, "RST%d")
-JMESSAGE(JTRC_SMOOTH_NOTIMPL,
-	 "Smoothing not supported with nonstandard sampling ratios")
-JMESSAGE(JTRC_SOF, "Start Of Frame 0x%02x: width=%u, height=%u, components=%d")
-JMESSAGE(JTRC_SOF_COMPONENT, "    Component %d: %dhx%dv q=%d")
-JMESSAGE(JTRC_SOI, "Start of Image")
-JMESSAGE(JTRC_SOS, "Start Of Scan: %d components")
-JMESSAGE(JTRC_SOS_COMPONENT, "    Component %d: dc=%d ac=%d")
-JMESSAGE(JTRC_SOS_PARAMS, "  Ss=%d, Se=%d, Ah=%d, Al=%d")
-JMESSAGE(JTRC_TFILE_CLOSE, "Closed temporary file %s")
-JMESSAGE(JTRC_TFILE_OPEN, "Opened temporary file %s")
-JMESSAGE(JTRC_THUMB_JPEG,
-	 "JFIF extension marker: JPEG-compressed thumbnail image, length %u")
-JMESSAGE(JTRC_THUMB_PALETTE,
-	 "JFIF extension marker: palette thumbnail image, length %u")
-JMESSAGE(JTRC_THUMB_RGB,
-	 "JFIF extension marker: RGB thumbnail image, length %u")
-JMESSAGE(JTRC_UNKNOWN_IDS,
-	 "Unrecognized component IDs %d %d %d, assuming YCbCr")
-JMESSAGE(JTRC_XMS_CLOSE, "Freed XMS handle %u")
-JMESSAGE(JTRC_XMS_OPEN, "Obtained XMS handle %u")
-JMESSAGE(JWRN_ADOBE_XFORM, "Unknown Adobe color transform code %d")
-JMESSAGE(JWRN_BOGUS_PROGRESSION,
-	 "Inconsistent progression sequence for component %d coefficient %d")
-JMESSAGE(JWRN_EXTRANEOUS_DATA,
-	 "Corrupt JPEG data: %u extraneous bytes before marker 0x%02x")
-JMESSAGE(JWRN_HIT_MARKER, "Corrupt JPEG data: premature end of data segment")
-JMESSAGE(JWRN_HUFF_BAD_CODE, "Corrupt JPEG data: bad Huffman code")
-JMESSAGE(JWRN_JFIF_MAJOR, "Warning: unknown JFIF revision number %d.%02d")
-JMESSAGE(JWRN_JPEG_EOF, "Premature end of JPEG file")
-JMESSAGE(JWRN_MUST_RESYNC,
-	 "Corrupt JPEG data: found marker 0x%02x instead of RST%d")
-JMESSAGE(JWRN_NOT_SEQUENTIAL, "Invalid SOS parameters for sequential JPEG")
-JMESSAGE(JWRN_TOO_MUCH_DATA, "Application transferred too many scanlines")
-
-#ifdef JMAKE_ENUM_LIST
-
-  JMSG_LASTMSGCODE
-} J_MESSAGE_CODE;
-
-#undef JMAKE_ENUM_LIST
-#endif /* JMAKE_ENUM_LIST */
-
-/* Zap JMESSAGE macro so that future re-inclusions do nothing by default */
-#undef JMESSAGE
-
-
-#ifndef JERROR_H
-#define JERROR_H
-
-/* Macros to simplify using the error and trace message stuff */
-/* The first parameter is either type of cinfo pointer */
-
-/* Fatal errors (print message and exit) */
-#define ERREXIT(cinfo,code)  \
-  ((cinfo)->err->msg_code = (code), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT1(cinfo,code,p1)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT2(cinfo,code,p1,p2)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT3(cinfo,code,p1,p2,p3)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (cinfo)->err->msg_parm.i[2] = (p3), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT4(cinfo,code,p1,p2,p3,p4)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (cinfo)->err->msg_parm.i[2] = (p3), \
-   (cinfo)->err->msg_parm.i[3] = (p4), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXITS(cinfo,code,str)  \
-  ((cinfo)->err->msg_code = (code), \
-   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-
-#define MAKESTMT(stuff)		do { stuff } while (0)
-
-/* Nonfatal errors (we can keep going, but the data is probably corrupt) */
-#define WARNMS(cinfo,code)  \
-  ((cinfo)->err->msg_code = (code), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
-#define WARNMS1(cinfo,code,p1)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
-#define WARNMS2(cinfo,code,p1,p2)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
-
-/* Informational/debugging messages */
-#define TRACEMS(cinfo,lvl,code)  \
-  ((cinfo)->err->msg_code = (code), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-#define TRACEMS1(cinfo,lvl,code,p1)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-#define TRACEMS2(cinfo,lvl,code,p1,p2)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-#define TRACEMS3(cinfo,lvl,code,p1,p2,p3)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMS4(cinfo,lvl,code,p1,p2,p3,p4)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMS5(cinfo,lvl,code,p1,p2,p3,p4,p5)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
-	   _mp[4] = (p5); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMS8(cinfo,lvl,code,p1,p2,p3,p4,p5,p6,p7,p8)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
-	   _mp[4] = (p5); _mp[5] = (p6); _mp[6] = (p7); _mp[7] = (p8); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMSS(cinfo,lvl,code,str)  \
-  ((cinfo)->err->msg_code = (code), \
-   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-
-#endif /* JERROR_H */

oxygine/third_party/win32/libjpeg/jconfig.h

@@ -15,7 +15,7 @@
 #undef NEED_SHORT_EXTERNAL_NAMES
 #undef INCOMPLETE_TYPES_BROKEN
 
-/* Define "boolean" as unsigned char, not enum, per Windows custom */
+/* Define "boolean" as unsigned char, not int, per Windows custom */
 #ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
 typedef unsigned char boolean;
 #endif

oxygine/third_party/win32/libjpeg/jmorecfg.h

@@ -2,7 +2,7 @@
  * jmorecfg.h
  *
  * Copyright (C) 1991-1997, Thomas G. Lane.
- * Modified 1997-2012 by Guido Vollbeding.
+ * Modified 1997-2009 by Guido Vollbeding.
  * This file is part of the Independent JPEG Group's software.
  * For conditions of distribution and use, see the accompanying README file.
  *
@@ -210,26 +210,6 @@ typedef unsigned int JDIMENSION;
 #endif
 
 
-/* The noreturn type identifier is used to declare functions
- * which cannot return.
- * Compilers can thus create more optimized code and perform
- * better checks for warnings and errors.
- * Static analyzer tools can make improved inferences about
- * execution paths and are prevented from giving false alerts.
- *
- * Unfortunately, the proposed specifications of corresponding
- * extensions in the Dec 2011 ISO C standard revision (C11),
- * GCC, MSVC, etc. are not viable.
- * Thus we introduce a user defined type to declare noreturn
- * functions at least for clarity.  A proper compiler would
- * have a suitable noreturn type to match in place of void.
- */
-
-#ifndef HAVE_NORETURN_T
-typedef void noreturn_t;
-#endif
-
-
 /* Here is the pseudo-keyword for declaring pointers that must be "far"
  * on 80x86 machines.  Most of the specialized coding for 80x86 is handled
  * by just saying "FAR *" where such a pointer is needed.  In a few places
@@ -252,16 +232,15 @@ typedef void noreturn_t;
  * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
  */
 
-#ifdef HAVE_BOOLEAN
+#ifndef HAVE_BOOLEAN
+typedef int boolean;
+#endif
 #ifndef FALSE			/* in case these macros already exist */
 #define FALSE	0		/* values of boolean */
 #endif
 #ifndef TRUE
 #define TRUE	1
 #endif
-#else
-typedef enum { FALSE = 0, TRUE = 1 } boolean;
-#endif
 
 
 /*
@@ -333,7 +312,9 @@ typedef enum { FALSE = 0, TRUE = 1 } boolean;
  * the offsets will also change the order in which colormap data is organized.
  * RESTRICTIONS:
  * 1. The sample applications cjpeg,djpeg do NOT support modified RGB formats.
- * 2. The color quantizer modules will not behave desirably if RGB_PIXELSIZE
+ * 2. These macros only affect RGB<=>YCbCr color conversion, so they are not
+ *    useful if you are using JPEG color spaces other than YCbCr or grayscale.
+ * 3. The color quantizer modules will not behave desirably if RGB_PIXELSIZE
  *    is not 3 (they don't understand about dummy color components!).  So you
  *    can't use color quantization if you change that value.
  */

oxygine/third_party/win32/libjpeg/jpeglib.h

@@ -2,7 +2,7 @@
  * jpeglib.h
  *
  * Copyright (C) 1991-1998, Thomas G. Lane.
- * Modified 2002-2012 by Guido Vollbeding.
+ * Modified 2002-2009 by Guido Vollbeding.
  * This file is part of the Independent JPEG Group's software.
  * For conditions of distribution and use, see the accompanying README file.
  *
@@ -33,13 +33,11 @@ extern "C" {
 #endif
 #endif
 
-/* Version IDs for the JPEG library.
- * Might be useful for tests like "#if JPEG_LIB_VERSION >= 90".
+/* Version ID for the JPEG library.
+ * Might be useful for tests like "#if JPEG_LIB_VERSION >= 80".
  */
 
-#define JPEG_LIB_VERSION        90	/* Compatibility version 9.0 */
-#define JPEG_LIB_VERSION_MAJOR  9
-#define JPEG_LIB_VERSION_MINOR  0
+#define JPEG_LIB_VERSION  80	/* Version 8.0 */
 
 
 /* Various constants determining the sizes of things.
@@ -47,7 +45,7 @@ extern "C" {
  * if you want to be compatible.
  */
 
-#define DCTSIZE		    8	/* The basic DCT block is 8x8 coefficients */
+#define DCTSIZE		    8	/* The basic DCT block is 8x8 samples */
 #define DCTSIZE2	    64	/* DCTSIZE squared; # of elements in a block */
 #define NUM_QUANT_TBLS      4	/* Quantization tables are numbered 0..3 */
 #define NUM_HUFF_TBLS       4	/* Huffman tables are numbered 0..3 */
@@ -221,13 +219,6 @@ typedef enum {
 	JCS_YCCK		/* Y/Cb/Cr/K */
 } J_COLOR_SPACE;
 
-/* Supported color transforms. */
-
-typedef enum {
-	JCT_NONE           = 0,
-	JCT_SUBTRACT_GREEN = 1
-} J_COLOR_TRANSFORM;
-
 /* DCT/IDCT algorithm options. */
 
 typedef enum {
@@ -376,10 +367,7 @@ struct jpeg_compress_struct {
   UINT16 X_density;		/* Horizontal pixel density */
   UINT16 Y_density;		/* Vertical pixel density */
   boolean write_Adobe_marker;	/* should an Adobe marker be written? */
-
-  J_COLOR_TRANSFORM color_transform;
-  /* Color transform identifier, writes LSE marker if nonzero */
-
+  
   /* State variable: index of next scanline to be written to
    * jpeg_write_scanlines().  Application may use this to control its
    * processing loop, e.g., "while (next_scanline < image_height)".
@@ -599,9 +587,6 @@ struct jpeg_decompress_struct {
   boolean saw_Adobe_marker;	/* TRUE iff an Adobe APP14 marker was found */
   UINT8 Adobe_transform;	/* Color transform code from Adobe marker */
 
-  J_COLOR_TRANSFORM color_transform;
-  /* Color transform identifier derived from LSE marker, otherwise zero */
-
   boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
 
   /* Aside from the specific data retained from APPn markers known to the
@@ -694,7 +679,7 @@ struct jpeg_decompress_struct {
 
 struct jpeg_error_mgr {
   /* Error exit handler: does not return to caller */
-  JMETHOD(noreturn_t, error_exit, (j_common_ptr cinfo));
+  JMETHOD(void, error_exit, (j_common_ptr cinfo));
   /* Conditionally emit a trace or warning message */
   JMETHOD(void, emit_message, (j_common_ptr cinfo, int msg_level));
   /* Routine that actually outputs a trace or error message */

oxygine/third_party/win32/libpng/pnglibconf.h

@@ -1,211 +0,0 @@
-/* libpng 1.6.2 STANDARD API DEFINITION */
-
-/* pnglibconf.h - library build configuration */
-
-/* Libpng version 1.6.2 - April 25, 2013 */
-
-/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
-
-/* This code is released under the libpng license. */
-/* For conditions of distribution and use, see the disclaimer */
-/* and license in png.h */
-
-/* pnglibconf.h */
-/* Machine generated file: DO NOT EDIT */
-/* Derived from: scripts/pnglibconf.dfa */
-#ifndef PNGLCONF_H
-#define PNGLCONF_H
-/* options */
-#define PNG_16BIT_SUPPORTED
-#define PNG_ALIGNED_MEMORY_SUPPORTED
-/*#undef PNG_ARM_NEON_API_SUPPORTED*/
-/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
-/*#undef PNG_ARM_NEON_SUPPORTED*/
-#define PNG_BENIGN_ERRORS_SUPPORTED
-#define PNG_BENIGN_READ_ERRORS_SUPPORTED
-/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/
-#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_COLORSPACE_SUPPORTED
-#define PNG_CONSOLE_IO_SUPPORTED
-#define PNG_CONVERT_tIME_SUPPORTED
-#define PNG_EASY_ACCESS_SUPPORTED
-/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
-#define PNG_ERROR_TEXT_SUPPORTED
-#define PNG_FIXED_POINT_SUPPORTED
-#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-#define PNG_FLOATING_POINT_SUPPORTED
-#define PNG_FORMAT_AFIRST_SUPPORTED
-#define PNG_FORMAT_BGR_SUPPORTED
-#define PNG_GAMMA_SUPPORTED
-#define PNG_GET_PALETTE_MAX_SUPPORTED
-#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#define PNG_INCH_CONVERSIONS_SUPPORTED
-#define PNG_INFO_IMAGE_SUPPORTED
-#define PNG_IO_STATE_SUPPORTED
-#define PNG_MNG_FEATURES_SUPPORTED
-#define PNG_POINTER_INDEXING_SUPPORTED
-#define PNG_PROGRESSIVE_READ_SUPPORTED
-#define PNG_READ_16BIT_SUPPORTED
-#define PNG_READ_ALPHA_MODE_SUPPORTED
-#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_READ_BACKGROUND_SUPPORTED
-#define PNG_READ_BGR_SUPPORTED
-#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
-#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
-#define PNG_READ_EXPAND_16_SUPPORTED
-#define PNG_READ_EXPAND_SUPPORTED
-#define PNG_READ_FILLER_SUPPORTED
-#define PNG_READ_GAMMA_SUPPORTED
-#define PNG_READ_GET_PALETTE_MAX_SUPPORTED
-#define PNG_READ_GRAY_TO_RGB_SUPPORTED
-#define PNG_READ_INTERLACING_SUPPORTED
-#define PNG_READ_INT_FUNCTIONS_SUPPORTED
-#define PNG_READ_INVERT_ALPHA_SUPPORTED
-#define PNG_READ_INVERT_SUPPORTED
-#define PNG_READ_OPT_PLTE_SUPPORTED
-#define PNG_READ_PACKSWAP_SUPPORTED
-#define PNG_READ_PACK_SUPPORTED
-#define PNG_READ_QUANTIZE_SUPPORTED
-#define PNG_READ_RGB_TO_GRAY_SUPPORTED
-#define PNG_READ_SCALE_16_TO_8_SUPPORTED
-#define PNG_READ_SHIFT_SUPPORTED
-#define PNG_READ_STRIP_16_TO_8_SUPPORTED
-#define PNG_READ_STRIP_ALPHA_SUPPORTED
-#define PNG_READ_SUPPORTED
-#define PNG_READ_SWAP_ALPHA_SUPPORTED
-#define PNG_READ_SWAP_SUPPORTED
-#define PNG_READ_TEXT_SUPPORTED
-#define PNG_READ_TRANSFORMS_SUPPORTED
-#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_READ_USER_CHUNKS_SUPPORTED
-#define PNG_READ_USER_TRANSFORM_SUPPORTED
-#define PNG_READ_bKGD_SUPPORTED
-#define PNG_READ_cHRM_SUPPORTED
-#define PNG_READ_gAMA_SUPPORTED
-#define PNG_READ_hIST_SUPPORTED
-#define PNG_READ_iCCP_SUPPORTED
-#define PNG_READ_iTXt_SUPPORTED
-#define PNG_READ_oFFs_SUPPORTED
-#define PNG_READ_pCAL_SUPPORTED
-#define PNG_READ_pHYs_SUPPORTED
-#define PNG_READ_sBIT_SUPPORTED
-#define PNG_READ_sCAL_SUPPORTED
-#define PNG_READ_sPLT_SUPPORTED
-#define PNG_READ_sRGB_SUPPORTED
-#define PNG_READ_tEXt_SUPPORTED
-#define PNG_READ_tIME_SUPPORTED
-#define PNG_READ_tRNS_SUPPORTED
-#define PNG_READ_zTXt_SUPPORTED
-/*#undef PNG_SAFE_LIMITS_SUPPORTED*/
-#define PNG_SAVE_INT_32_SUPPORTED
-#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_SEQUENTIAL_READ_SUPPORTED
-#define PNG_SETJMP_SUPPORTED
-#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
-#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-/*#undef PNG_SET_OPTION_SUPPORTED*/
-#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_SET_USER_LIMITS_SUPPORTED
-#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
-#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED
-#define PNG_SIMPLIFIED_READ_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_SUPPORTED
-#define PNG_STDIO_SUPPORTED
-#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_TEXT_SUPPORTED
-#define PNG_TIME_RFC1123_SUPPORTED
-#define PNG_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_CHUNKS_SUPPORTED
-#define PNG_USER_LIMITS_SUPPORTED
-#define PNG_USER_MEM_SUPPORTED
-#define PNG_USER_TRANSFORM_INFO_SUPPORTED
-#define PNG_USER_TRANSFORM_PTR_SUPPORTED
-#define PNG_WARNINGS_SUPPORTED
-#define PNG_WRITE_16BIT_SUPPORTED
-#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_BGR_SUPPORTED
-#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-#define PNG_WRITE_FILLER_SUPPORTED
-#define PNG_WRITE_FILTER_SUPPORTED
-#define PNG_WRITE_FLUSH_SUPPORTED
-#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED
-#define PNG_WRITE_INTERLACING_SUPPORTED
-#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
-#define PNG_WRITE_INVERT_SUPPORTED
-#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-#define PNG_WRITE_PACKSWAP_SUPPORTED
-#define PNG_WRITE_PACK_SUPPORTED
-#define PNG_WRITE_SHIFT_SUPPORTED
-#define PNG_WRITE_SUPPORTED
-#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
-#define PNG_WRITE_SWAP_SUPPORTED
-#define PNG_WRITE_TEXT_SUPPORTED
-#define PNG_WRITE_TRANSFORMS_SUPPORTED
-#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
-#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-#define PNG_WRITE_bKGD_SUPPORTED
-#define PNG_WRITE_cHRM_SUPPORTED
-#define PNG_WRITE_gAMA_SUPPORTED
-#define PNG_WRITE_hIST_SUPPORTED
-#define PNG_WRITE_iCCP_SUPPORTED
-#define PNG_WRITE_iTXt_SUPPORTED
-#define PNG_WRITE_oFFs_SUPPORTED
-#define PNG_WRITE_pCAL_SUPPORTED
-#define PNG_WRITE_pHYs_SUPPORTED
-#define PNG_WRITE_sBIT_SUPPORTED
-#define PNG_WRITE_sCAL_SUPPORTED
-#define PNG_WRITE_sPLT_SUPPORTED
-#define PNG_WRITE_sRGB_SUPPORTED
-#define PNG_WRITE_tEXt_SUPPORTED
-#define PNG_WRITE_tIME_SUPPORTED
-#define PNG_WRITE_tRNS_SUPPORTED
-#define PNG_WRITE_zTXt_SUPPORTED
-#define PNG_bKGD_SUPPORTED
-#define PNG_cHRM_SUPPORTED
-#define PNG_gAMA_SUPPORTED
-#define PNG_hIST_SUPPORTED
-#define PNG_iCCP_SUPPORTED
-#define PNG_iTXt_SUPPORTED
-#define PNG_oFFs_SUPPORTED
-#define PNG_pCAL_SUPPORTED
-#define PNG_pHYs_SUPPORTED
-#define PNG_sBIT_SUPPORTED
-#define PNG_sCAL_SUPPORTED
-#define PNG_sPLT_SUPPORTED
-#define PNG_sRGB_SUPPORTED
-#define PNG_tEXt_SUPPORTED
-#define PNG_tIME_SUPPORTED
-#define PNG_tRNS_SUPPORTED
-#define PNG_zTXt_SUPPORTED
-/* end of options */
-/* settings */
-#define PNG_API_RULE 0
-#define PNG_CALLOC_SUPPORTED
-#define PNG_COST_SHIFT 3
-#define PNG_DEFAULT_READ_MACROS 1
-#define PNG_GAMMA_THRESHOLD_FIXED 5000
-#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
-#define PNG_INFLATE_BUF_SIZE 1024
-#define PNG_MAX_GAMMA_8 11
-#define PNG_QUANTIZE_BLUE_BITS 5
-#define PNG_QUANTIZE_GREEN_BITS 5
-#define PNG_QUANTIZE_RED_BITS 5
-#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)
-#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
-#define PNG_WEIGHT_SHIFT 8
-#define PNG_ZBUF_SIZE 8192
-#define PNG_Z_DEFAULT_COMPRESSION (-1)
-#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
-#define PNG_Z_DEFAULT_STRATEGY 1
-#define PNG_sCAL_PRECISION 5
-#define PNG_sRGB_PROFILE_CHECKS 2
-/* end of settings */
-#endif /* PNGLCONF_H */