diff options
Diffstat (limited to 'DevIL/src-ILUT')
| -rw-r--r-- | DevIL/src-ILUT/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | DevIL/src-ILUT/src/ilut_win32.cpp | 6 |
2 files changed, 26 insertions, 4 deletions
diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt index 296f9955..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) @@ -32,7 +50,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) @@ -50,6 +70,8 @@ set_target_properties(ILUT PROPERTIES SOVERSION 1) target_link_libraries(ILUT IL ILU + ${OPENGL_LIBRARIES} + ${GLUT_LIBRARY} ) # generate pkg-config file 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 |