can't revert all changes back to restore working cmake... so I replace it by file from master

CMakeLists.txt

@@ -8,29 +8,27 @@ set(OX_HAVE_LIBCURL 0)
 set(OX_HAVE_HTTP 0)
 set(OX_USE_SDL2 1)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 find_package(OpenGL)
-set(OXYGINE_INCLUDE_DIRS ${OXYGINE_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIRS})
-
-if (EMSCRIPTEN) #don't need SDL2
-else()
-	if(WIN32)
-		set(ENV{SDL2DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../SDL/include)
-		set(CORE_LIBS ${CORE_LIBS} SDL2main SDL2)
-	else(WIN32)
-		find_package(CURL)
-	endif()
 
-	find_package(SDL2)
+if (EMSCRIPTEN)
+	#don't need SDL2
+elseif (WIN32)	
+	#hardcoded path to SDL2 on windows
+	set(SDL2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../SDL/include)
+else(WIN32)
+	find_path(SDL2_INCLUDE_DIRS NAMES SDL2/SDL.h)
+	message(STATUS ${SDL2_INCLUDE_DIRS_FOUND})
 
-	if (SDL2_FOUND)
-		message(STATUS "SDL2 found")
-		include_directories(${SDL2_INCLUDE_DIR})
+	if (SDL2_INCLUDE_DIRS)		
+		set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIRS}/SDL2)
+		message(STATUS "found")		
 	else()
-		message(STATUS "SDL2 not found")
-		set(SDL2_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../SDL/include)
+		message(STATUS "SDL not found")
+		set(SDL2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../SDL/include)					
 	endif()
+
+	find_package(CURL)
 endif(EMSCRIPTEN)
 
 
@@ -45,7 +43,7 @@ set(FOLDERS src src/closure src/minizip src/core
 
 if (EMSCRIPTEN)
 	set(PLATFORM emscripten)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") 	
 	set(PLATFORM linux)
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	set(PLATFORM ios)
@@ -58,9 +56,11 @@ endif()
 
 set(THIRD_PARTY ${OXYGINE_ROOT}/third_party/${PLATFORM})
 
+
+
 if (EMSCRIPTEN)
 	set(OX_HAVE_LIBPNG 1)
-	set(OX_HAVE_HTTP 1)
+	set(OX_HAVE_HTTP 1)	
 	set(OX_USE_SDL2 0)
 
 	set(SOURCES ${OXYGINE_SRC}/core/emscripten/HttpRequestEmscriptenTask.cpp)
@@ -68,10 +68,16 @@ if (EMSCRIPTEN)
 
 	file(GLOB OXYGINE_JS_LIBRARIES ${OXYGINE_SRC}/core/emscripten/*.js)
 
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") 	
+	
+	set(OX_HAVE_LIBJPEG 1)
+	set(OX_HAVE_LIBPNG 1)
+
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 elseif(MSVC)
+
 	set(OX_HAVE_LIBJPEG 1)
-	set(OX_HAVE_LIBPNG 1)
+	set(OX_HAVE_LIBPNG 1)	
 	set(OX_HAVE_LIBCURL 1)
 	set(OX_HAVE_HTTP 1)
 
@@ -79,77 +85,15 @@ elseif(MSVC)
 
 	set(OX_DEFINITIONS	${OX_DEFINITIONS} -D_CRT_SECURE_NO_WARNINGS)
 
-elseif(MINGW)
+elseif(MINGW)	
+
 	set(libprefix lib)
 
-	set(OX_HAVE_LIBPNG 1)
+	set(OX_HAVE_LIBPNG 1)	
 	set(OX_HAVE_LIBCURL 1)
 	set(OX_HAVE_HTTP 1)
-else()  # anything else (POSIX we assume)
-	set(OX_HAVE_LIBJPEG 1)
-	set(OX_HAVE_LIBPNG 1)
-endif()
-
-#add png library
-if (OX_HAVE_LIBPNG)
-	set(OX_DEFINITIONS	${OX_DEFINITIONS}
-		-DOX_HAVE_LIBPNG)
-	if (MSVC)
-		include_directories(${THIRD_PARTY}/libpng)
-		set(LIBPNG ${libprefix}png)
-		if (MSVC_VERSION EQUAL "1900")
-			set(LIBPNG ${LIBPNG}-2015)
-		endif()
-		set(CORE_LIBS ${CORE_LIBS} ${LIBPNG})
-	elseif(EMSCRIPTEN)
-		include_directories(${THIRD_PARTY}/libpng)
-		set(LIBPNG ${libprefix}png)
-		set(LIBPNG libz libpng16)
-		set(CORE_LIBS ${CORE_LIBS} ${LIBPNG})
-	else()
-		find_package(PNG REQUIRED)
-		set (CORE_LIBS
-			${CORE_LIBS}
-			${PNG_LIBRARIES}
-		)
-		include_directories(
-			${PNG_INCLUDE_DIR}
-		)
-
-		set(OXYGINE_INCLUDE_DIRS
-			${OXYGINE_INCLUDE_DIRS}
-			${PNG_INCLUDE_DIR}
-		)
-	endif()
-endif(OX_HAVE_LIBPNG)
-
-#add jpeg library
-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)		
-	else()
-		find_package(JPEG REQUIRED)
-		set (CORE_LIBS
-			${CORE_LIBS}
-			${JPEG_LIBRARIES}
-		)
-		include_directories(
-			${JPEG_INCLUDE_DIR}
-		)
-		set(OXYGINE_INCLUDE_DIRS
-			${OXYGINE_INCLUDE_DIRS}
-			${JPEG_INCLUDE_DIR}
-		)
-	endif()
-endif(OX_HAVE_LIBJPEG)
 
+endif()
 
 if (OX_HAVE_LIBCURL)	
 	set(FOLDERS ${FOLDERS} src/core/curl)
@@ -177,8 +121,6 @@ endforeach(ITEM)
 
 set(OXYGINE_INCLUDE_DIRS 
 	${OXYGINE_SRC}
-	${SDL2_INCLUDE_DIR}
-	${OPENGL_INCLUDE_DIR}
 	${THIRD_PARTY}/pthreads/include/
 	${THIRD_PARTY}/zlib)
 
@@ -207,11 +149,9 @@ set(CORE_LIBS
 
 
 if (OX_USE_SDL2)
-	if (WIN32)
-	elseif(EMSCRIPTEN)
-	else(WIN32)
-		set(CORE_LIBS ${CORE_LIBS} ${SDL2_LIBRARY})
-	endif(WIN32)
+	set(CORE_LIBS ${CORE_LIBS}
+		SDL2main SDL2)
+	set(OXYGINE_INCLUDE_DIRS ${OXYGINE_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS})
 endif(OX_USE_SDL2)	
 
 
@@ -226,6 +166,39 @@ else(WIN32)
 endif(WIN32)
 
 
+
+if (OX_HAVE_LIBPNG)		
+	set(OX_DEFINITIONS	${OX_DEFINITIONS} -DOX_HAVE_LIBPNG)
+	include_directories(${THIRD_PARTY}/libpng)
+	set(LIBPNG ${libprefix}png)
+
+	if (MSVC)		
+		if (MSVC_VERSION EQUAL "1900")
+			set(LIBPNG ${LIBPNG}-2015)
+		endif()
+	elseif(EMSCRIPTEN)
+		set(LIBPNG libz libpng16)
+	endif()	
+
+	set(CORE_LIBS ${CORE_LIBS} ${LIBPNG})
+endif(OX_HAVE_LIBPNG)
+
+
+if (OX_HAVE_LIBJPEG)	
+	set(OX_DEFINITIONS	${OX_DEFINITIONS} -DOX_HAVE_LIBJPEG)
+	include_directories(${THIRD_PARTY}/libjpeg)
+	set(LIBJPEG ${libprefix}jpeg)
+	
+	if (MSVC)
+		if (MSVC_VERSION EQUAL "1900")
+			set(LIBJPEG ${LIBJPEG}-2015)
+		endif()	
+	endif()
+
+	set(CORE_LIBS ${CORE_LIBS} ${LIBJPEG})
+endif(OX_HAVE_LIBJPEG)
+
+
 if (NOT EMSCRIPTEN)
 	set(CORE_LIBS ${CORE_LIBS}
 		${libprefix}z${libprefix})
@@ -262,7 +235,7 @@ set(OXYGINE_JS_LIBRARIES
 	${OXYGINE_JS_LIBRARIES}
 	PARENT_SCOPE)
 
-message(STATUS "SDL includes: ${SDL2_INCLUDE_DIR}")
+message(STATUS "SDL includes: ${SDL2_INCLUDE_DIRS}")
 message(STATUS "Libs:     ${CORE_LIBS}")
 message(STATUS "Platform: ${PLATFORM}")