From 320047d9ecd5f3df37d0f28893017e88e374fdc2 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 2 Feb 2017 09:36:35 +0300 Subject: Add missing export function. --- DevIL/include/IL/il.h | 1 + 1 file changed, 1 insertion(+) diff --git a/DevIL/include/IL/il.h b/DevIL/include/IL/il.h index d3bf65db..6aacb3bb 100644 --- a/DevIL/include/IL/il.h +++ b/DevIL/include/IL/il.h @@ -625,6 +625,7 @@ ILAPI void ILAPIENTRY ilShutDown(void); ILAPI ILboolean ILAPIENTRY ilSurfaceToDxtcData(ILenum Format); ILAPI ILboolean ILAPIENTRY ilTexImage(ILuint Width, ILuint Height, ILuint Depth, ILubyte NumChannels, ILenum Format, ILenum Type, void *Data); ILAPI ILboolean ILAPIENTRY ilTexImageDxtc(ILint w, ILint h, ILint d, ILenum DxtFormat, const ILubyte* data); +ILAPI ILboolean ILAPIENTRY ilTexImageSurface(ILuint Width, ILuint Height, ILuint Depth, ILubyte NumChannels, ILenum Format, ILenum Type, void *Data); ILAPI ILenum ILAPIENTRY ilTypeFromExt(ILconst_string FileName); ILAPI ILboolean ILAPIENTRY ilTypeFunc(ILenum Mode); ILAPI ILboolean ILAPIENTRY ilLoadData(ILconst_string FileName, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp); -- cgit v1.2.1 From c0a1b5151c1ad4494440603f7051f6150bfa91f1 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 2 Feb 2017 09:38:14 +0300 Subject: FindOpenEXR cmake module define OPENEXR_INCLUDE_DIR not OPENEXR_INCLUDE_DIRS --- DevIL/src-IL/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt index 2547a81b..b47d2b0d 100644 --- a/DevIL/src-IL/CMakeLists.txt +++ b/DevIL/src-IL/CMakeLists.txt @@ -266,7 +266,7 @@ if(NOT IL_NO_LCMS) endif(NOT IL_NO_LCMS) if(NOT IL_NO_EXR) - list(APPEND incs ${OPENEXR_INCLUDE_DIRS} ) + list(APPEND incs ${OPENEXR_INCLUDE_DIR} ) list(APPEND libs ${OPENEXR_LIBRARIES} ) endif(NOT IL_NO_EXR) -- cgit v1.2.1 From c7daffbaf08d3effb4cb33efa94e7b71cbe7bfd5 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 2 Feb 2017 09:40:47 +0300 Subject: Search openexr includes also in subfolder --- DevIL/src-IL/cmake/FindOpenEXR.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/DevIL/src-IL/cmake/FindOpenEXR.cmake b/DevIL/src-IL/cmake/FindOpenEXR.cmake index 3718d989..2525d2dd 100644 --- a/DevIL/src-IL/cmake/FindOpenEXR.cmake +++ b/DevIL/src-IL/cmake/FindOpenEXR.cmake @@ -11,6 +11,7 @@ FIND_PATH(OPENEXR_INCLUDE_DIR ImfIO.h + $ENV{OPENEXR_DIR}/include/OpenEXR $ENV{OPENEXR_DIR}/include $ENV{OPENEXR_DIR} ~/Library/Frameworks -- cgit v1.2.1 From 2cd8bf6da61c853789f01af475fe755e3160622f Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 2 Feb 2017 09:53:24 +0300 Subject: Fix export in ILUT --- DevIL/src-ILUT/src/ilut_win32.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DevIL/src-ILUT/src/ilut_win32.cpp b/DevIL/src-ILUT/src/ilut_win32.cpp index 69ace517..110de391 100644 --- a/DevIL/src-ILUT/src/ilut_win32.cpp +++ b/DevIL/src-ILUT/src/ilut_win32.cpp @@ -761,10 +761,10 @@ ILboolean ILAPIENTRY ilutLoadResource(HINSTANCE hInst, ILint ID, ILstring Resour } -#if !defined(_WIN32_WCE) && !(defined(_WIN32) && defined(__GNUC__)) -#define BUFFSIZE 8192 // Change to suit the efficiency. ILboolean ILAPIENTRY ilutWinLoadUrl(ILstring Url) { +#if !defined(_WIN32_WCE) && !(defined(_WIN32) && defined(__GNUC__)) +#define BUFFSIZE 8192 // Change to suit the efficiency. HINTERNET Handle, UrlHandle; DWORD BytesRead = 0, Context = 1; ILubyte Buff[BUFFSIZE], *Buffer, *TempBuff; @@ -847,10 +847,10 @@ ILboolean ILAPIENTRY ilutWinLoadUrl(ILstring Url) } ifree(Buffer); +#endif return IL_TRUE; } -#endif #endif//ILUT_USE_WIN32 -- cgit v1.2.1 From e470ec83cf1ce72b7095ea737c357e4be5312236 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 2 Feb 2017 09:56:22 +0300 Subject: Guard compile flags for MSVC --- DevIL/src-ILUT/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt index 296f9955..a2926bec 100644 --- a/DevIL/src-ILUT/CMakeLists.txt +++ b/DevIL/src-ILUT/CMakeLists.txt @@ -32,7 +32,9 @@ if(WIN32) else(UNICODE) set(ILUT_RSRC ${ILUT_RSRC} "msvc/resources/IL Logo.ico" "msvc/ILUT.rc") endif(UNICODE) - set(CMAKE_C_FLAGS_RELEASE "/MT /O2") + if(MSVC) + set(CMAKE_C_FLAGS_RELEASE "/MT /O2") + endif(MSVC) else(BUILD_SHARED_LIBS) add_definitions(-DIL_STATIC_LIB) endif(BUILD_SHARED_LIBS) -- cgit v1.2.1 From c9f4c016c7bcb4d994d867f0a340aaaa01b93ddc Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 2 Feb 2017 10:01:02 +0300 Subject: ILUT need opengl and glut for linking --- DevIL/src-ILUT/CMakeLists.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt index a2926bec..63662bc6 100644 --- a/DevIL/src-ILUT/CMakeLists.txt +++ b/DevIL/src-ILUT/CMakeLists.txt @@ -20,6 +20,24 @@ endif( CMAKE_SIZEOF_VOID_P EQUAL 8 ) include_directories( include ../include ) +# Find glut +find_package(GLUT REQUIRED) +include_directories(${GLUT_INCLUDE_DIRS}) +link_directories(${GLUT_LIBRARY_DIRS}) +add_definitions(${GLUT_DEFINITIONS}) +if(NOT GLUT_FOUND) + message(ERROR " GLUT not found!") +endif(NOT GLUT_FOUND) + +# Find opengl +find_package(OpenGL REQUIRED) +include_directories(${OpenGL_INCLUDE_DIRS}) +link_directories(${OpenGL_LIBRARY_DIRS}) +add_definitions(${OpenGL_DEFINITIONS}) +if(NOT OPENGL_FOUND) + message(ERROR " OPENGL not found!") +endif(NOT OPENGL_FOUND) + # for windows add the .def and .rc files to the source list if(WIN32) add_definitions(-DALLEGRO_MSVC) @@ -52,6 +70,8 @@ set_target_properties(ILUT PROPERTIES SOVERSION 1) target_link_libraries(ILUT IL ILU + ${OPENGL_LIBRARIES} + ${GLUT_LIBRARY} ) # generate pkg-config file -- cgit v1.2.1 From 773ef6f0cd10069298f4497fa260d2f04351de8c Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 2 Feb 2017 10:13:48 +0300 Subject: Use standart library name for mingw builds --- DevIL/src-IL/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt index b47d2b0d..3cda85cf 100644 --- a/DevIL/src-IL/CMakeLists.txt +++ b/DevIL/src-IL/CMakeLists.txt @@ -219,11 +219,11 @@ set_target_properties(IL PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${LIBDIR}) set_target_properties(IL PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${LIBDIR}) set_target_properties(IL PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR}) -if(WIN32) +if(MSVC) # Linux uses libIL.so, libILU.so, and libILUT.so, but Windows uses # DevIL.dll, ILU.dll, and ILUT.dll. set_target_properties(IL PROPERTIES OUTPUT_NAME "DevIL") -endif(WIN32) +endif(MSVC) if(UNICODE) MESSAGE("DevIL, Compiling IL Unicode") -- cgit v1.2.1