diff --git a/cmake/modules/FindGLFW3.cmake b/cmake/modules/FindGLFW3.cmake
index 27213bf..13bbb84 100644
--- a/cmake/modules/FindGLFW3.cmake
+++ b/cmake/modules/FindGLFW3.cmake
@@ -18,11 +18,11 @@ set( _glfw3_HEADER_SEARCH_DIRS
 "/usr/include"
 "/usr/local/include"
 "${CMAKE_SOURCE_DIR}/includes"
-"${CMAKE_SOURCE_DIR}/lib"
 "C:/Program Files (x86)/glfw/include" )
 set( _glfw3_LIB_SEARCH_DIRS
 "/usr/lib"
 "/usr/local/lib"
+"${CMAKE_SOURCE_DIR}/lib"
 "C:/Program Files (x86)/glfw/lib-msvc110" )
 
 # Check environment for root search directory
diff --git a/cmake/modules/FindSOIL.cmake b/cmake/modules/FindSOIL.cmake
index 81a703a..97b3047 100644
--- a/cmake/modules/FindSOIL.cmake
+++ b/cmake/modules/FindSOIL.cmake
@@ -9,27 +9,34 @@
 #
 # author: Kazunori Kimura
 # email : kazunori.abu@gmail.com
-find_path(SOIL_INCLUDE_DIR_TMP SOIL.h
-	HINTS ${SOIL_ROOT_DIR}
-	PATH_SUFFIXES include/SOIL SOIL include
+#
+# revisions: github.com/zwookie
+
+find_path(SOIL_INCLUDE_DIR SOIL.h
+	/usr/include
+	/usr/local/include
+	/opt/local/include
 	${CMAKE_SOURCE_DIR}/includes
+)
+
+find_library(SOIL_LIBRARY SOIL
+	/usr/lib64
+	/usr/lib
+	/usr/local/lib
+	/opt/local/lib
 	${CMAKE_SOURCE_DIR}/lib
 )
-if(${SOIL_INCLUDE_DIR_TMP} STREQUAL "SOIL_INCLUDE_DIR_TMP-NOTFOUND")
-	set(SOIL_INCLUDE_DIR ${SOIL_INCLUDE_DIR_TMP})
-else()
-	string(REGEX REPLACE "(.*)/SOIL" "\\1" SOIL_INCLUDE_DIR ${SOIL_INCLUDE_DIR_TMP})
-endif()
 
-find_library(SOIL_LIBRARY
-	NAMES SOIL
-	HINTS ${SOIL_ROOT_DIR}
-	PATH_SUFFIXES lib
-)
-
-unset(INCLUDE_SEARCH_PATH)
-unset(LIB_SEARCH_PATH)
-unset(SOIL_INCLUDE_DIR_TMP)
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SOIL
-REQUIRED_VARS SOIL_LIBRARY SOIL_INCLUDE_DIR)
+IF(SOIL_INCLUDE_DIR AND SOIL_LIBRARY)
+	SET( SOIL_FOUND TRUE )
+	SET( SOIL_LIBRARIES ${SOIL_LIBRARY} )
+ENDIF(SOIL_INCLUDE_DIR AND SOIL_LIBRARY)
+IF(SOIL_FOUND)
+	IF(NOT SOIL_FIND_QUIETLY)
+	MESSAGE(STATUS "Found SOIL: ${SOIL_LIBRARY}")
+	ENDIF(NOT SOIL_FIND_QUIETLY)
+ELSE(SOIL_FOUND)
+	IF(SOIL_FIND_REQUIRED)
+	MESSAGE(FATAL_ERROR "Could not find libSOIL")
+	ENDIF(SOIL_FIND_REQUIRED)
+ENDIF(SOIL_FOUND)