minor fixes

CMakeLists.txt

@@ -128,12 +128,12 @@ if (OX_HAVE_LIBJPEG)
 	set(OX_DEFINITIONS	${OX_DEFINITIONS}
 		-DOX_HAVE_LIBJPEG)
 	if (MSVC)
+		set(LIBJPEG ${libprefix}jpeg)
 		if (MSVC_VERSION EQUAL "1900")
 			set(LIBJPEG ${LIBJPEG}-2015)
 		endif()
 		set(CORE_LIBS ${CORE_LIBS} ${LIBJPEG})
-		include_directories(${THIRD_PARTY}/libjpeg)
-		set(LIBJPEG ${libprefix}jpeg)
+		include_directories(${THIRD_PARTY}/libjpeg)		
 	else()
 		find_package(JPEG REQUIRED)
 		set (CORE_LIBS

examples/Demo/data/ext/res_ui.xml.ox/meta.xml

@@ -1 +1 @@
-<resources version="2"><set/><atlas><atlas file="1_0.png" format="r8g8b8a8" h="512" w="256"/><image fs="1,1,128,128,1.000000" ht="0,128,32,32">0,1,242,12,21,107,58;</image><image fs="1,1,150,107,1.000000" ht="128,208,37,26">0,1,133,0,0,150,107;</image><image fs="3,1,166,44,1.000000">0,1,45,1,1,164,42;0,1,1,1,1,165,42;0,1,89,2,2,164,42;</image><ht len="448">AAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAMA/AAD8fwAA/v8BQP//A4D//wfAP/AD4A/AD+ADgB/gA4Af+AGAH/gBgD/4AQA/+AEAHsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAIB/AAAAAAAA4P8BAAAAAADg/wEAAAAAAOD/AQAAAAAA8P8DAAAAAADw8wMAAAAAAPj/AQAAAAAA/P///wcAAAD/////DwAAAP////8PAAAA/////w8AAAD/H///DwAAAP+///8PAAAA/3///w8AAAD8////DwAAAPz///8PAAAA/P///w8AAAD8/P//BwAAAPz8//8PAAAA/P///x8AAAD8////HwAAAPz///8fAAAA+P///x8AAADwv///DwAAAMAf+AMAAAAA</ht></atlas></resources>
+<resources version="2"><set/><atlas><atlas file="1_0.png" format="r8g8b8a8" h="512" w="256"/><image fs="1,1,128,128,1.000000" ht="0,128,32,32">0,2,251,12,21,107,58;</image><image fs="1,1,150,107,1.000000" ht="128,208,37,26">0,2,140,0,0,150,107;</image><image fs="3,1,166,44,1.000000">0,2,48,1,1,164,42;0,2,2,1,1,165,42;0,2,94,2,2,164,42;</image><ht len="448">AAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAMA/AAD8fwAA/v8BQP//A4D//wfAP/AD4A/AD+ADgB/gA4Af+AGAH/gBgD/4AQA/+AEAHsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAIB/AAAAAAAA4P8BAAAAAADg/wEAAAAAAOD/AQAAAAAA8P8DAAAAAADw8wMAAAAAAPj/AQAAAAAA/P///wcAAAD/////DwAAAP////8PAAAA/////w8AAAD/H///DwAAAP+///8PAAAA/3///w8AAAD8////DwAAAPz///8PAAAA/P///w8AAAD8/P//BwAAAPz8//8PAAAA/P///x8AAAD8////HwAAAPz///8fAAAA+P///x8AAADwv///DwAAAMAf+AMAAAAA</ht></atlas></resources>

examples/Demo/proj.cmake/CMakeLists.txt

@@ -9,7 +9,7 @@ link_directories(${OXYGINE_LIBRARY_DIRS})
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 add_executable(Demo ../src/Counter.cpp ../src/entry_point.cpp ../src/example.cpp ../src/test.cpp 
 	../src/Counter.h ../src/TestAlphaHitTest.h ../src/TestBox9Sprite.h ../src/TestClipRect.h
-	../src/TestColorFont.h ../src/TestTweenGlow.h ../src/TestCounter.h ../src/TestDrag.h ../src/TestHttp.h ../src/TestInputText.h ../src/TestManageRes.h ../src/TestMask.h ../src/TestPerf.h ../src/TestPolygon.h ../src/TestProgressBar.h ../src/TestRender2Texture.h ../src/TestSliding.h ../src/TestTexel2Pixel.h ../src/TestText.h ../src/TestTextureFormat.h ../src/TestTweenText.h ../src/TestTweens.h ../src/TestUserShader.h ../src/TestUserShader2.h ../src/TestAlphaFade.h ../src/example.h ../src/test.h )
+	../src/TestColorFont.h ../src/TestTweenGlow.h ../src/TestCounter.h ../src/TestDrag.h ../src/TestHttp.h ../src/TestInputText.h ../src/TestManageRes.h ../src/TestMask.h ../src/TestPerf.h ../src/TestPolygon.h ../src/TestProgressBar.h ../src/TestRender2Texture.h ../src/TestSliding.h ../src/TestTexel2Pixel.h ../src/TestText.h ../src/TestTextureFormat.h ../src/TestTweenText.h ../src/TestTweens.h ../src/TestUserShader.h ../src/TestUserShader2.h ../src/TestTweenAlphaFade.h ../src/example.h ../src/test.h )
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(Demo PROPERTIES WIN32_EXECUTABLE TRUE)