Commits

Anonymous committed 0f6a4b6

- more mingw fixes
- use the correct JPEG path

  • Participants
  • Parent commits cff126c

Comments (0)

Files changed (1)

File CMakeLists.txt

 	ENABLE_TESTING()
 endif(BUILD_TEST)
 
-
 if (NOT WIN32)
 	if(CMAKE_BUILD_TYPE)
 		STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
 	ENDIF(XPM_FOUND)
 
 	IF(JPEG_FOUND)
-		INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
+		INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
 		SET(HAVE_LIBJPEG 1)
 	ENDIF(JPEG_FOUND)
 
 		if(NOT MINGW AND MSVC_VERSION GREATER 1399)
 			ADD_DEFINITIONS("/D_CRT_SECURE_NO_DEPRECATE")
 		endif(NOT MINGW AND MSVC_VERSION GREATER 1399)
-		if (MINGW)
+		if (MINGW OR MSYS)
 			ADD_DEFINITIONS("-mms-bitfields -m32")
-		endif (MINGW)
+		endif (MINGW OR MSYS)
 	else (WIN32)
 		SET(GD_LIB gd)
 	endif (WIN32)