From 795611a488658a5cdefdba211ad976f24c556f0f Mon Sep 17 00:00:00 2001 From: Ben Campbell Date: Thu, 10 Nov 2016 23:43:29 +1300 Subject: re-enable ILU and ILUT in cmake build --- DevIL/CMakeLists.txt | 4 +- DevIL/data/ILU.pc.in | 11 - DevIL/data/ILUT.pc.in | 10 - DevIL/src-ILU/CMakeLists.txt | 79 +- DevIL/src-ILU/msvc8/ILU Unicode.rc | 132 -- DevIL/src-ILU/msvc8/ILU Unicode.vcproj | 1113 --------- DevIL/src-ILU/msvc8/ILU.rc | 132 -- DevIL/src-ILU/msvc8/ILU.vcproj | 1112 --------- DevIL/src-ILU/msvc8/ilu.def | 56 - DevIL/src-ILU/msvc8/resource.h | 17 - DevIL/src-ILU/msvc8/resources/IL Logo.ico | Bin 2166 -> 0 bytes DevIL/src-ILU/msvc9/ILU Unicode.rc | 132 -- DevIL/src-ILU/msvc9/ILU Unicode.vcproj | 3514 ---------------------------- DevIL/src-ILU/msvc9/ILU.dsp | 247 -- DevIL/src-ILU/msvc9/ILU.rc | 132 -- DevIL/src-ILU/msvc9/ILU.vcproj | 1109 --------- DevIL/src-ILU/msvc9/ilu.def | 56 - DevIL/src-ILU/msvc9/resource.h | 17 - DevIL/src-ILU/msvc9/resources/IL Logo.ico | Bin 2166 -> 0 bytes DevIL/src-ILU/pkgconfig/ILU.pc.cmake.in | 13 + DevIL/src-ILU/pkgconfig/README | 3 + DevIL/src-ILUT/CMakeLists.txt | 79 +- DevIL/src-ILUT/msvc8/ILUT Unicode.rc | 132 -- DevIL/src-ILUT/msvc8/ILUT Unicode.vcproj | 778 ------ DevIL/src-ILUT/msvc8/ILUT.dsp | 228 -- DevIL/src-ILUT/msvc8/ILUT.rc | 132 -- DevIL/src-ILUT/msvc8/ILUT.vcproj | 812 ------- DevIL/src-ILUT/msvc8/ilut.def | 74 - DevIL/src-ILUT/msvc8/resource.h | 17 - DevIL/src-ILUT/msvc8/resources/IL Logo.ico | Bin 2166 -> 0 bytes DevIL/src-ILUT/msvc8/resources/ILUT.rc | 135 -- DevIL/src-ILUT/msvc9/ILUT Unicode.rc | 132 -- DevIL/src-ILUT/msvc9/ILUT Unicode.vcproj | 1451 ------------ DevIL/src-ILUT/msvc9/ILUT.dsp | 228 -- DevIL/src-ILUT/msvc9/ILUT.rc | 132 -- DevIL/src-ILUT/msvc9/ILUT.vcproj | 817 ------- DevIL/src-ILUT/msvc9/ilut.def | 70 - DevIL/src-ILUT/msvc9/resource.h | 17 - DevIL/src-ILUT/msvc9/resources/IL Logo.ico | Bin 2166 -> 0 bytes DevIL/src-ILUT/msvc9/resources/ILUT.rc | 135 -- DevIL/src-ILUT/pkgconfig/ILUT.pc.cmake.in | 14 + DevIL/src-ILUT/pkgconfig/README | 3 + 42 files changed, 119 insertions(+), 13156 deletions(-) delete mode 100644 DevIL/data/ILU.pc.in delete mode 100644 DevIL/data/ILUT.pc.in delete mode 100644 DevIL/src-ILU/msvc8/ILU Unicode.rc delete mode 100644 DevIL/src-ILU/msvc8/ILU Unicode.vcproj delete mode 100644 DevIL/src-ILU/msvc8/ILU.rc delete mode 100644 DevIL/src-ILU/msvc8/ILU.vcproj delete mode 100644 DevIL/src-ILU/msvc8/ilu.def delete mode 100644 DevIL/src-ILU/msvc8/resource.h delete mode 100644 DevIL/src-ILU/msvc8/resources/IL Logo.ico delete mode 100644 DevIL/src-ILU/msvc9/ILU Unicode.rc delete mode 100644 DevIL/src-ILU/msvc9/ILU Unicode.vcproj delete mode 100644 DevIL/src-ILU/msvc9/ILU.dsp delete mode 100644 DevIL/src-ILU/msvc9/ILU.rc delete mode 100644 DevIL/src-ILU/msvc9/ILU.vcproj delete mode 100644 DevIL/src-ILU/msvc9/ilu.def delete mode 100644 DevIL/src-ILU/msvc9/resource.h delete mode 100644 DevIL/src-ILU/msvc9/resources/IL Logo.ico create mode 100644 DevIL/src-ILU/pkgconfig/ILU.pc.cmake.in create mode 100644 DevIL/src-ILU/pkgconfig/README delete mode 100644 DevIL/src-ILUT/msvc8/ILUT Unicode.rc delete mode 100644 DevIL/src-ILUT/msvc8/ILUT Unicode.vcproj delete mode 100644 DevIL/src-ILUT/msvc8/ILUT.dsp delete mode 100644 DevIL/src-ILUT/msvc8/ILUT.rc delete mode 100644 DevIL/src-ILUT/msvc8/ILUT.vcproj delete mode 100644 DevIL/src-ILUT/msvc8/ilut.def delete mode 100644 DevIL/src-ILUT/msvc8/resource.h delete mode 100644 DevIL/src-ILUT/msvc8/resources/IL Logo.ico delete mode 100644 DevIL/src-ILUT/msvc8/resources/ILUT.rc delete mode 100644 DevIL/src-ILUT/msvc9/ILUT Unicode.rc delete mode 100644 DevIL/src-ILUT/msvc9/ILUT Unicode.vcproj delete mode 100644 DevIL/src-ILUT/msvc9/ILUT.dsp delete mode 100644 DevIL/src-ILUT/msvc9/ILUT.rc delete mode 100644 DevIL/src-ILUT/msvc9/ILUT.vcproj delete mode 100644 DevIL/src-ILUT/msvc9/ilut.def delete mode 100644 DevIL/src-ILUT/msvc9/resource.h delete mode 100644 DevIL/src-ILUT/msvc9/resources/IL Logo.ico delete mode 100644 DevIL/src-ILUT/msvc9/resources/ILUT.rc create mode 100644 DevIL/src-ILUT/pkgconfig/ILUT.pc.cmake.in create mode 100644 DevIL/src-ILUT/pkgconfig/README diff --git a/DevIL/CMakeLists.txt b/DevIL/CMakeLists.txt index 5f3dd3c0..305f272e 100644 --- a/DevIL/CMakeLists.txt +++ b/DevIL/CMakeLists.txt @@ -3,6 +3,6 @@ cmake_minimum_required(VERSION 2.6) project(ImageLib) add_subdirectory(src-IL) -#add_subdirectory(src-ILU) -#add_subdirectory(src-ILUT) +add_subdirectory(src-ILU) +add_subdirectory(src-ILUT) diff --git a/DevIL/data/ILU.pc.in b/DevIL/data/ILU.pc.in deleted file mode 100644 index 4479abd6..00000000 --- a/DevIL/data/ILU.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ - -Name: ILU -Description: Developer's Image Library - ILU part (image library utilities) -Version: @VERSION@ -URL: http://openil.sourceforge.net -Requires: IL -Libs: -L@libdir@ -lILU -Libs.private: @ILU_LIBS@ -lIL -Cflags: -I@includedir@ @IL_CFLAGS@ diff --git a/DevIL/data/ILUT.pc.in b/DevIL/data/ILUT.pc.in deleted file mode 100644 index 1ce899ee..00000000 --- a/DevIL/data/ILUT.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ - -Name: ILUT -Description: Developer's Image Library - ILUT part (connection to higher level libraries) -Version: @VERSION@ -URL: http://openil.sourceforge.net -Libs: -L@libdir@ -lILUT -ILU -lIL -Libs.private: @ILUT_LIBS@ -Cflags: -I@includedir@ @IL_CFLAGS@ diff --git a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt index 7ed0295e..b06a1417 100644 --- a/DevIL/src-ILU/CMakeLists.txt +++ b/DevIL/src-ILU/CMakeLists.txt @@ -1,50 +1,57 @@ -PROJECT(ILU) +cmake_minimum_required(VERSION 2.6) -FILE(GLOB ILU_SRCS src/*.c) -FILE(GLOB ILU_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilu.h) -FILE(GLOB ILU_RSRC) +project(ILU) -INCLUDE_DIRECTORIES( +file(GLOB ILU_SRCS src/*.c) +file(GLOB ILU_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilu.h) +file(GLOB ILU_RSRC) - ${ILU_SOURCE_DIR}/include -) - -#SET(ILU_SRCS ${ILU_SRCS} ${ILU_INCS} ) +include_directories( include ../include ) -SET(LIBRARY_OUTPUT_PATH ${DEVIL_LIB_DEST_DIR} ) - -# # for windows add the .def and .rc files to the source list -# -IF(WIN32) - ADD_DEFINITIONS(-DIL_USE_PRAGMA_LIBS) - IF(BUILD_SHARED_LIBS) - ADD_DEFINITIONS(-DILU_DLL) - SET(ILU_SRCS ${ILU_SRCS} msvc/ilu.def) - SET(ILU_RSRC ${ILU_RSRC} "msvc/resources/IL Logo.ico" msvc/ILU.rc) - SET(CMAKE_C_FLAGS_RELEASE "/MT /O2") - ELSE(BUILD_SHARED_LIBS) - ADD_DEFINITIONS(-DIL_STATIC_LIB) - ENDIF(BUILD_SHARED_LIBS) -ENDIF(WIN32) - - -SOURCE_GROUP("Source Files" FILES src/*.c) -SOURCE_GROUP("Header Files" FILES ${ILU_INC} ) -SOURCE_GROUP("Resource Files" FILES ${ILU_RSRC} ) +if(WIN32) + #add_definitions(-DIL_USE_PRAGMA_LIBS) + if(BUILD_SHARED_LIBS) + add_definitions(-DILU_DLL) + set(ILU_SRCS ${ILU_SRCS} msvc/ilu.def) + set(ILU_RSRC ${ILU_RSRC} "msvc/resources/IL Logo.ico" msvc/ILU.rc) + set(CMAKE_C_FLAGS_RELEASE "/MT /O2") + else(BUILD_SHARED_LIBS) + add_definitions(-DIL_STATIC_LIB) + endif(BUILD_SHARED_LIBS) +endif(WIN32) + + +source_group("Source Files" FILES src/*.c) +source_group("Header Files" FILES ${ILU_INC} ) +source_group("Resource Files" FILES ${ILU_RSRC} ) # Remove SHARED to create a static library -ADD_LIBRARY(ILU SHARED ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC}) - +add_library(ILU SHARED ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC}) -## add link sub library info -TARGET_LINK_LIBRARIES(ILU +## ILU requires IL +target_link_libraries(ILU IL ) -INCLUDE_DIRECTORIES( +# generate pkg-config file +# TODO: add Requires.private or Libs.private +# (needed to support static linking?) +configure_file( pkgconfig/ILU.pc.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/ILU.pc @ONLY) - ${DevIL_SOURCE_DIR}/../include - ${DevIL_SOURCE_DIR}/include + +# Installation +install (TARGETS ILU + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) +install (FILES ../include/IL/ilu.h DESTINATION include/IL) + +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/ILU.pc + DESTINATION lib/pkgconfig ) + diff --git a/DevIL/src-ILU/msvc8/ILU Unicode.rc b/DevIL/src-ILU/msvc8/ILU Unicode.rc deleted file mode 100644 index 704efd37..00000000 --- a/DevIL/src-ILU/msvc8/ILU Unicode.rc +++ /dev/null @@ -1,132 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,7,8 - PRODUCTVERSION 0,1,7,8 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x29L -#else - FILEFLAGS 0x28L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "ILU: A portable image library in development" - VALUE "CompanyName", "Abysmal Software" - VALUE "FileDescription", "ILU: A portable image library in development" - VALUE "FileVersion", "1.7.8" - VALUE "InternalName", "ILU" - VALUE "LegalCopyright", "Copyright © 2000-2008" - VALUE "LegalTrademarks", "Under LGPL License" - VALUE "OriginalFilename", "ILU.dll" - VALUE "PrivateBuild", "Open Source" - VALUE "ProductName", "Developer's Image Utilities Library" - VALUE "ProductVersion", "1.7.8 Unicode" - VALUE "SpecialBuild", "Unicode" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON "resources\\IL Logo.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.8" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/DevIL/src-ILU/msvc8/ILU Unicode.vcproj b/DevIL/src-ILU/msvc8/ILU Unicode.vcproj deleted file mode 100644 index bbbbf656..00000000 --- a/DevIL/src-ILU/msvc8/ILU Unicode.vcproj +++ /dev/null @@ -1,1113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DevIL/src-ILU/msvc8/ILU.rc b/DevIL/src-ILU/msvc8/ILU.rc deleted file mode 100644 index 1351cefe..00000000 --- a/DevIL/src-ILU/msvc8/ILU.rc +++ /dev/null @@ -1,132 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,7,8 - PRODUCTVERSION 0,1,7,8 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x29L -#else - FILEFLAGS 0x28L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "ILU: A portable image library in development" - VALUE "CompanyName", "Abysmal Software" - VALUE "FileDescription", "ILU: A portable image library in development" - VALUE "FileVersion", "1.7.8" - VALUE "InternalName", "ILU" - VALUE "LegalCopyright", "Copyright © 2000-2008" - VALUE "LegalTrademarks", "Under LGPL License" - VALUE "OriginalFilename", "ILU.dll" - VALUE "PrivateBuild", "Open Source" - VALUE "ProductName", "Developer's Image Utilities Library" - VALUE "ProductVersion", "1.7.8 Ansi" - VALUE "SpecialBuild", "Ansi" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON "resources\\IL Logo.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.8" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/DevIL/src-ILU/msvc8/ILU.vcproj b/DevIL/src-ILU/msvc8/ILU.vcproj deleted file mode 100644 index 5c5b159d..00000000 --- a/DevIL/src-ILU/msvc8/ILU.vcproj +++ /dev/null @@ -1,1112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DevIL/src-ILU/msvc8/ilu.def b/DevIL/src-ILU/msvc8/ilu.def deleted file mode 100644 index b9587839..00000000 --- a/DevIL/src-ILU/msvc8/ilu.def +++ /dev/null @@ -1,56 +0,0 @@ -; To remove an export, add a semicolon at the beginning of the line to comment it out. - -EXPORTS -iluAlienify -iluBlurAvg -iluBlurGaussian -iluBuildMipmaps -iluColoursUsed -iluConvolution -iluCompareImage -iluContrast -iluCrop -iluDeleteImage -iluEdgeDetectE -iluEdgeDetectP -iluEdgeDetectS -iluEmboss -iluEnlargeCanvas -iluEnlargeImage -iluEqualize -iluErrorString -iluFlipImage -iluGenImage -iluGetImageInfo -iluGetString -iluGammaCorrect -iluGetInteger -iluGetIntegerv -iluImageParameter -iluInit -iluInvertAlpha -iluLoadImage -iluMirror -iluNegative -iluNoisify -iluPixelize -iluRegionfv -iluRegioniv -iluReplaceColour -iluRotate -iluRotate3D -iluSaturate1f -iluSaturate4f -iluScaleColours -iluScale -iluScaleAlpha -iluSetLanguage -iluSharpen -iluSwapColours -iluWave - - -; Internal but exported functions -iluRotate_ -iluRotate3D_ -iluScale_ diff --git a/DevIL/src-ILU/msvc8/resource.h b/DevIL/src-ILU/msvc8/resource.h deleted file mode 100644 index f9f24ba4..00000000 --- a/DevIL/src-ILU/msvc8/resource.h +++ /dev/null @@ -1,17 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by ILU Unicode.rc -// -#define IDC_OPENILU 109 -#define IDI_ICON1 155 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/DevIL/src-ILU/msvc8/resources/IL Logo.ico b/DevIL/src-ILU/msvc8/resources/IL Logo.ico deleted file mode 100644 index e05ac9b1..00000000 Binary files a/DevIL/src-ILU/msvc8/resources/IL Logo.ico and /dev/null differ diff --git a/DevIL/src-ILU/msvc9/ILU Unicode.rc b/DevIL/src-ILU/msvc9/ILU Unicode.rc deleted file mode 100644 index 704efd37..00000000 --- a/DevIL/src-ILU/msvc9/ILU Unicode.rc +++ /dev/null @@ -1,132 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,7,8 - PRODUCTVERSION 0,1,7,8 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x29L -#else - FILEFLAGS 0x28L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "ILU: A portable image library in development" - VALUE "CompanyName", "Abysmal Software" - VALUE "FileDescription", "ILU: A portable image library in development" - VALUE "FileVersion", "1.7.8" - VALUE "InternalName", "ILU" - VALUE "LegalCopyright", "Copyright © 2000-2008" - VALUE "LegalTrademarks", "Under LGPL License" - VALUE "OriginalFilename", "ILU.dll" - VALUE "PrivateBuild", "Open Source" - VALUE "ProductName", "Developer's Image Utilities Library" - VALUE "ProductVersion", "1.7.8 Unicode" - VALUE "SpecialBuild", "Unicode" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON "resources\\IL Logo.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.8" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/DevIL/src-ILU/msvc9/ILU Unicode.vcproj b/DevIL/src-ILU/msvc9/ILU Unicode.vcproj deleted file mode 100644 index 6884b9f7..00000000 --- a/DevIL/src-ILU/msvc9/ILU Unicode.vcproj +++ /dev/null @@ -1,3514 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DevIL/src-ILU/msvc9/ILU.dsp b/DevIL/src-ILU/msvc9/ILU.dsp deleted file mode 100644 index c4c6fb95..00000000 --- a/DevIL/src-ILU/msvc9/ILU.dsp +++ /dev/null @@ -1,247 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ILU" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=ILU - Win32 Debug -!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE -!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl -!MESSAGE -!MESSAGE NMAKE /f "ILU.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "ILU.mak" CFG="ILU - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "ILU - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ILU - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ILU - Win32 Dynamic" (basierend auf "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "ILU" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ILU - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "../../lib/debug" -# PROP BASE Intermediate_Dir "../src/obj/debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../lib/debug" -# PROP Intermediate_Dir "../src/obj/debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILU_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILU_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../../lib/debug/ilu-d.dll" /pdbtype:sept -# Begin Special Build Tool -TargetName=ilu-d -SOURCE="$(InputPath)" -PostBuild_Cmds=..\..\projects\msvc\insdll.bat ..\..\lib\debug\$(TargetName).dll -# End Special Build Tool - -!ELSEIF "$(CFG)" == "ILU - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "../../lib" -# PROP BASE Intermediate_Dir "../src/obj" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "../src/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILU_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../include" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILU_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\include" /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib winspool.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib user32.lib gdi32.lib comdlg32.lib shell32.lib devil.lib /nologo /dll /machine:I386 /libpath:"../../lib" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy ..\..\lib\ilu.dll "C:\path\ilu.dll" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "ILU - Win32 Dynamic" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "../../lib" -# PROP BASE Intermediate_Dir "../src/obj/dynamic" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "../src/obj/dynamic" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILU_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILU_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../../lib/ilu-l.dll" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../../lib/ilu-l.dll" -# Begin Special Build Tool -TargetName=ilu-l -SOURCE="$(InputPath)" -PostBuild_Cmds=..\..\projects\msvc\insdll.bat ..\..\lib\$(TargetName).dll -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "ILU - Win32 Debug" -# Name "ILU - Win32 Release" -# Name "ILU - Win32 Dynamic" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\ilu.def -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_error.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_filter.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_filter_rcg.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_internal.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_main.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_manip.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_mipmap.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_noise.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_region.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_rotate.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_scale.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_scale2d.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_scale3d.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_states.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilu_utilities.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\include\IL\devil_internal_exports.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\il\ilu.h -# End Source File -# Begin Source File - -SOURCE=..\include\ilu_filter.h -# End Source File -# Begin Source File - -SOURCE=..\include\ilu_internal.h -# End Source File -# Begin Source File - -SOURCE=..\include\ilu_mipmap.h -# End Source File -# Begin Source File - -SOURCE=..\include\ilu_region.h -# End Source File -# Begin Source File - -SOURCE=..\include\ilu_states.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=".\resources\IL Logo.ico" -# End Source File -# Begin Source File - -SOURCE=.\ILU.rc -# End Source File -# End Group -# End Target -# End Project diff --git a/DevIL/src-ILU/msvc9/ILU.rc b/DevIL/src-ILU/msvc9/ILU.rc deleted file mode 100644 index 1351cefe..00000000 --- a/DevIL/src-ILU/msvc9/ILU.rc +++ /dev/null @@ -1,132 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,7,8 - PRODUCTVERSION 0,1,7,8 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x29L -#else - FILEFLAGS 0x28L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "ILU: A portable image library in development" - VALUE "CompanyName", "Abysmal Software" - VALUE "FileDescription", "ILU: A portable image library in development" - VALUE "FileVersion", "1.7.8" - VALUE "InternalName", "ILU" - VALUE "LegalCopyright", "Copyright © 2000-2008" - VALUE "LegalTrademarks", "Under LGPL License" - VALUE "OriginalFilename", "ILU.dll" - VALUE "PrivateBuild", "Open Source" - VALUE "ProductName", "Developer's Image Utilities Library" - VALUE "ProductVersion", "1.7.8 Ansi" - VALUE "SpecialBuild", "Ansi" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON "resources\\IL Logo.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.8" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/DevIL/src-ILU/msvc9/ILU.vcproj b/DevIL/src-ILU/msvc9/ILU.vcproj deleted file mode 100644 index cb70f90d..00000000 --- a/DevIL/src-ILU/msvc9/ILU.vcproj +++ /dev/null @@ -1,1109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DevIL/src-ILU/msvc9/ilu.def b/DevIL/src-ILU/msvc9/ilu.def deleted file mode 100644 index b9587839..00000000 --- a/DevIL/src-ILU/msvc9/ilu.def +++ /dev/null @@ -1,56 +0,0 @@ -; To remove an export, add a semicolon at the beginning of the line to comment it out. - -EXPORTS -iluAlienify -iluBlurAvg -iluBlurGaussian -iluBuildMipmaps -iluColoursUsed -iluConvolution -iluCompareImage -iluContrast -iluCrop -iluDeleteImage -iluEdgeDetectE -iluEdgeDetectP -iluEdgeDetectS -iluEmboss -iluEnlargeCanvas -iluEnlargeImage -iluEqualize -iluErrorString -iluFlipImage -iluGenImage -iluGetImageInfo -iluGetString -iluGammaCorrect -iluGetInteger -iluGetIntegerv -iluImageParameter -iluInit -iluInvertAlpha -iluLoadImage -iluMirror -iluNegative -iluNoisify -iluPixelize -iluRegionfv -iluRegioniv -iluReplaceColour -iluRotate -iluRotate3D -iluSaturate1f -iluSaturate4f -iluScaleColours -iluScale -iluScaleAlpha -iluSetLanguage -iluSharpen -iluSwapColours -iluWave - - -; Internal but exported functions -iluRotate_ -iluRotate3D_ -iluScale_ diff --git a/DevIL/src-ILU/msvc9/resource.h b/DevIL/src-ILU/msvc9/resource.h deleted file mode 100644 index ef602253..00000000 --- a/DevIL/src-ILU/msvc9/resource.h +++ /dev/null @@ -1,17 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by ILU.rc -// -#define IDC_OPENILU 109 -#define IDI_ICON1 155 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/DevIL/src-ILU/msvc9/resources/IL Logo.ico b/DevIL/src-ILU/msvc9/resources/IL Logo.ico deleted file mode 100644 index e05ac9b1..00000000 Binary files a/DevIL/src-ILU/msvc9/resources/IL Logo.ico and /dev/null differ diff --git a/DevIL/src-ILU/pkgconfig/ILU.pc.cmake.in b/DevIL/src-ILU/pkgconfig/ILU.pc.cmake.in new file mode 100644 index 00000000..e1204e78 --- /dev/null +++ b/DevIL/src-ILU/pkgconfig/ILU.pc.cmake.in @@ -0,0 +1,13 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +includedir=${prefix}/include +libdir=${exec_prefix}/lib + +Name: ILU +Description: Developer's Image Library - ILU part (image library utilities) +Version: @VERSION@ +URL: http://openil.sourceforge.net +Requires: IL +Cflags: -I${includedir} +Libs: -L${libdir} -lILU +Libs.private: -lIL diff --git a/DevIL/src-ILU/pkgconfig/README b/DevIL/src-ILU/pkgconfig/README new file mode 100644 index 00000000..88788d45 --- /dev/null +++ b/DevIL/src-ILU/pkgconfig/README @@ -0,0 +1,3 @@ +ILU.pc.cmake.in is the template file for building ILU.pc, which +provides pkg-config support for ILU. + diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt index 9977eb15..a64fec42 100644 --- a/DevIL/src-ILUT/CMakeLists.txt +++ b/DevIL/src-ILUT/CMakeLists.txt @@ -1,52 +1,55 @@ -PROJECT(ILUT) +cmake_minimum_required(VERSION 2.6) -FILE(GLOB ILUT_SRCS src/*.c) -FILE(GLOB ILUT_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilut.h) -FILE(GLOB ILUT_RSRC) +project(ILUT) -INCLUDE_DIRECTORIES( - - ${ILUT_SOURCE_DIR}/include -) - -#SET(ILUT_SRCS ${ILUT_SRCS} ${ILUT_INCS} ) +file(GLOB ILUT_SRCS src/*.c) +file(GLOB ILUT_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilut.h) +file(GLOB ILUT_RSRC) +include_directories( include ../include ) -SET(LIBRARY_OUTPUT_PATH ${DEVIL_LIB_DEST_DIR} ) - -# # for windows add the .def and .rc files to the source list -# -IF(WIN32) - ADD_DEFINITIONS(-DALLEGRO_MSVC) - ADD_DEFINITIONS(-DIL_USE_PRAGMA_LIBS) - IF(BUILD_SHARED_LIBS) - ADD_DEFINITIONS(-DILUT_DLL) - SET(ILUT_SRCS ${ILUT_SRCS} msvc/ilut.def) - SET(ILUT_RSRC ${ILUT_RSRC} "msvc/resources/IL Logo.ico" msvc/ILUT.rc) - SET(CMAKE_C_FLAGS_RELEASE "/MT /O2") - ELSE(BUILD_SHARED_LIBS) - ADD_DEFINITIONS(-DIL_STATIC_LIB) - ENDIF(BUILD_SHARED_LIBS) -ENDIF(WIN32) - -SOURCE_GROUP("Source Files" FILES src/*.c) -SOURCE_GROUP("Header Files" FILES ${ILUT_INC} ) -SOURCE_GROUP("Resource Files" FILES ${ILUT_RSRC} ) +if(WIN32) + add_definitions(-DALLEGRO_MSVC) + add_definitions(-DIL_USE_PRAGMA_LIBS) + if(BUILD_SHARED_LIBS) + add_definitions(-DILUT_DLL) + set(ILUT_SRCS ${ILUT_SRCS} msvc/ilut.def) + set(ILUT_RSRC ${ILUT_RSRC} "msvc/resources/IL Logo.ico" msvc/ILUT.rc) + set(CMAKE_C_FLAGS_RELEASE "/MT /O2") + else(BUILD_SHARED_LIBS) + add_definitions(-DIL_STATIC_LIB) + endif(BUILD_SHARED_LIBS) +endif(WIN32) + +source_group("Source Files" FILES src/*.c) +source_group("Header Files" FILES ${ILUT_INC} ) +source_group("Resource Files" FILES ${ILUT_RSRC} ) # Remove SHARED to create a static library -ADD_LIBRARY(ILUT SHARED ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC}) - +add_library(ILUT SHARED ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC}) ## add link sub library info - -TARGET_LINK_LIBRARIES(ILUT +target_link_libraries(ILUT IL ILU ) -INCLUDE_DIRECTORIES( - ${DevIL_SOURCE_DIR}/../include - ${DevIL_SOURCE_DIR}/include - ${DevILU_SOURCE_DIR}/include +# generate pkg-config file +configure_file( pkgconfig/ILUT.pc.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc @ONLY) + + +# Installation +install (TARGETS ILUT + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin ) +install (FILES ../include/IL/ilut.h DESTINATION include/IL) + +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc + DESTINATION lib/pkgconfig +) + diff --git a/DevIL/src-ILUT/msvc8/ILUT Unicode.rc b/DevIL/src-ILUT/msvc8/ILUT Unicode.rc deleted file mode 100644 index 6969c0f3..00000000 --- a/DevIL/src-ILUT/msvc8/ILUT Unicode.rc +++ /dev/null @@ -1,132 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,7,8 - PRODUCTVERSION 0,1,7,8 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x29L -#else - FILEFLAGS 0x28L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "ILUT: A portable image library in development" - VALUE "CompanyName", "Abysmal Software" - VALUE "FileDescription", "ILUT: A portable image library in development" - VALUE "FileVersion", "1.7.8" - VALUE "InternalName", "ILUT" - VALUE "LegalCopyright", "Copyright © 2000-2008" - VALUE "LegalTrademarks", "Under LGPL License" - VALUE "OriginalFilename", "ILUT.dll" - VALUE "PrivateBuild", "Open Source" - VALUE "ProductName", "Developer's Image Utility Toolkit Library" - VALUE "ProductVersion", "1.7.8 Unicode" - VALUE "SpecialBuild", "Unicode" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON "resources\\IL Logo.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.7.8" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/DevIL/src-ILUT/msvc8/ILUT Unicode.vcproj b/DevIL/src-ILUT/msvc8/ILUT Unicode.vcproj deleted file mode 100644 index 1852060e..00000000 --- a/DevIL/src-ILUT/msvc8/ILUT Unicode.vcproj +++ /dev/null @@ -1,778 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DevIL/src-ILUT/msvc8/ILUT.dsp b/DevIL/src-ILUT/msvc8/ILUT.dsp deleted file mode 100644 index 35c8c1f6..00000000 --- a/DevIL/src-ILUT/msvc8/ILUT.dsp +++ /dev/null @@ -1,228 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ILUT" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=ILUT - WIN32 DEBUG -!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE -!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl -!MESSAGE -!MESSAGE NMAKE /f "ILUT.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "ILUT.mak" CFG="ILUT - WIN32 DEBUG" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "ILUT - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ILUT - Win32 Dynamic" (basierend auf "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ILUT - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "ILUT" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ILUT - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "../../lib/debug" -# PROP BASE Intermediate_Dir "../src/obj/debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../lib/debug" -# PROP Intermediate_Dir "../src/obj/debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILUT_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILUT_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 devil.lib ilu.lib delayimp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\ilut.def" /out:"c:\path\ilut.dll" /pdbtype:sept /libpath:"../../lib" /delayload:d3d8.dll /delayload:sdl.dll -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "ILUT - Win32 Dynamic" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "../../lib" -# PROP BASE Intermediate_Dir "../src/obj/dynamic" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "../src/obj/dynamic" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILUT_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILUT_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 delayimp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\ilut.def" /out:"../../lib/ilut-l.dll" /delayload:d3d8.dll /delayload:sdl.dll -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 delayimp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\ilut.def" /out:"../../lib/ilut-l.dll" /delayload:d3d8.dll /delayload:sdl.dll -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -TargetName=ilut-l -SOURCE="$(InputPath)" -PostBuild_Cmds=..\..\projects\msvc\insdll.bat ..\..\lib\$(TargetName).dll -# End Special Build Tool - -!ELSEIF "$(CFG)" == "ILUT - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "../../lib" -# PROP BASE Intermediate_Dir "../src/obj" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "../src/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILUT_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../include" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILUT_EXPORTS" /D "IL_STATIC_LIB" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 delayimp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\ilut.def" /delayload:d3d8.dll /delayload:sdl.dll -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 devil.lib ilu.lib kernel32.lib winspool.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib user32.lib gdi32.lib comdlg32.lib shell32.lib /nologo /dll /machine:I386 /def:".\ilut.def" /libpath:"../../lib" /delayload:d3d8.dll /delayload:sdl.dll -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy ..\..\lib\ilut.dll "C:\path\ilut.dll" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "ILUT - Win32 Debug" -# Name "ILUT - Win32 Dynamic" -# Name "ILUT - Win32 Release" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\ilut.def - -!IF "$(CFG)" == "ILUT - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "ILUT - Win32 Dynamic" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "ILUT - Win32 Release" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_directx.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_internal.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_main.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_opengl.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_sdlsurface.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_states.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_win32.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\include\IL\devil_internal_exports.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\il\ilut.h -# End Source File -# Begin Source File - -SOURCE=..\include\ilut_internal.h -# End Source File -# Begin Source File - -SOURCE=..\include\ilut_opengl.h -# End Source File -# Begin Source File - -SOURCE=..\include\ilut_states.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=".\resources\IL Logo.ico" -# End Source File -# Begin Source File - -SOURCE=.\ILUT.rc -# End Source File -# End Group -# End Target -# End Project diff --git a/DevIL/src-ILUT/msvc8/ILUT.rc b/DevIL/src-ILUT/msvc8/ILUT.rc deleted file mode 100644 index 55045ff6..00000000 --- a/DevIL/src-ILUT/msvc8/ILUT.rc +++ /dev/null @@ -1,132 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,7,8 - PRODUCTVERSION 0,1,7,8 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x29L -#else - FILEFLAGS 0x28L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "ILUT: A portable image library in development" - VALUE "CompanyName", "Abysmal Software" - VALUE "FileDescription", "ILUT: A portable image library in development" - VALUE "FileVersion", "1.7.8" - VALUE "InternalName", "ILUT" - VALUE "LegalCopyright", "Copyright © 2000-2008" - VALUE "LegalTrademarks", "Under LGPL License" - VALUE "OriginalFilename", "ILUT.dll" - VALUE "PrivateBuild", "Open Source" - VALUE "ProductName", "Developer's Image Utility Toolkit Library" - VALUE "ProductVersion", "1.7.8 Ansi" - VALUE "SpecialBuild", "Ansi" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON "resources\\IL Logo.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.7.8" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/DevIL/src-ILUT/msvc8/ILUT.vcproj b/DevIL/src-ILUT/msvc8/ILUT.vcproj deleted file mode 100644 index ac92659e..00000000 --- a/DevIL/src-ILUT/msvc8/ILUT.vcproj +++ /dev/null @@ -1,812 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DevIL/src-ILUT/msvc8/ilut.def b/DevIL/src-ILUT/msvc8/ilut.def deleted file mode 100644 index 1df72c41..00000000 --- a/DevIL/src-ILUT/msvc8/ilut.def +++ /dev/null @@ -1,74 +0,0 @@ -; To remove an export, add a semicolon at the beginning of the line to comment it out. - -EXPORTS -ilutConvertToHBitmap - -ilutConvertSliceToHBitmap -;ilutConvertToSDLSurface -;ilutSDLSurfaceFromBitmap -;ilutSDLSurfaceLoadImage -;ilutD3D8LoadSurface -;ilutD3D8MipFunc -;ilutD3D8Texture -;ilutD3D8TexFromFile -;ilutD3D8VolumeTexture -;ilutD3D8VolTexFromFile -;ilutD3D8TexFromFileInMemory -;ilutD3D8VolTexFromFileInMemory -;ilutD3D8TexFromFileHandle -;ilutD3D8VolTexFromFileHandle -;ilutD3D8TexFromResource -;ilutD3D8VolTexFromResource -;ilutD3D9LoadSurface -;ilutD3D9MipFunc -;ilutD3D9Texture -;ilutD3D9TexFromFile -;ilutD3D9VolumeTexture -;ilutD3D9VolTexFromFile -;ilutD3D9TexFromFileInMemory -;ilutD3D9VolTexFromFileInMemory -;ilutD3D9TexFromFileHandle -;ilutD3D9VolTexFromFileHandle -;ilutD3D9TexFromResource -;ilutD3D9VolTexFromResource -ilutDisable -ilutEnable -ilutFreePaddedData -ilutGetBmpInfo -ilutGetBoolean -ilutGetBooleanv -ilutGetHPal -ilutGetInteger -ilutGetIntegerv -ilutGetPaddedData -ilutGetString -ilutGetWinClipboard -ilutInit -ilutIsDisabled -ilutIsEnabled -ilutLoadResource -ilutGLBindMipmaps -ilutGLBindTexImage -ilutGLBuildMipmaps -ilutGLLoadImage -ilutGLSaveImage -ilutGLScreen -ilutGLScreenie -ilutGLSetTex -ilutGLSetTex2D -ilutGLSetTex3D -ilutGLSubTex -ilutGLSubTex2D -ilutGLSubTex3D -ilutGLTexImage -ilutPopAttrib -ilutPushAttrib -ilutRenderer -ilutSetHBitmap -ilutSetHPal -ilutSetInteger -ilutSetWinClipboard -ilutWinLoadImage -ilutWinLoadUrl -ilutWinPrint -ilutWinSaveImage diff --git a/DevIL/src-ILUT/msvc8/resource.h b/DevIL/src-ILUT/msvc8/resource.h deleted file mode 100644 index f6707e83..00000000 --- a/DevIL/src-ILUT/msvc8/resource.h +++ /dev/null @@ -1,17 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by ILUT Unicode.rc -// -#define IDC_OPENILUT 109 -#define IDI_ICON1 155 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/DevIL/src-ILUT/msvc8/resources/IL Logo.ico b/DevIL/src-ILUT/msvc8/resources/IL Logo.ico deleted file mode 100644 index e05ac9b1..00000000 Binary files a/DevIL/src-ILUT/msvc8/resources/IL Logo.ico and /dev/null differ diff --git a/DevIL/src-ILUT/msvc8/resources/ILUT.rc b/DevIL/src-ILUT/msvc8/resources/ILUT.rc deleted file mode 100644 index cde2e77b..00000000 --- a/DevIL/src-ILUT/msvc8/resources/ILUT.rc +++ /dev/null @@ -1,135 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,2,4 - PRODUCTVERSION 0,1,2,4 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x29L -#else - FILEFLAGS 0x28L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "ILUT: A great portable image library in development\0" - VALUE "CompanyName", "Abysmal Software\0" - VALUE "FileDescription", "ILUT: A great portable image library in development\0" - VALUE "FileVersion", "1.2.4\0" - VALUE "InternalName", "ILUT\0" - VALUE "LegalCopyright", "Copyright © 2000-2001\0" - VALUE "LegalTrademarks", "Under LGPL License\0" - VALUE "OriginalFilename", "ILUT.dll\0" - VALUE "PrivateBuild", "Open Source\0" - VALUE "ProductName", "Developer's Image Utility Toolkit Library\0" - VALUE "ProductVersion", "1.2.4\0" - VALUE "SpecialBuild", "eh?\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "resources\\IL Logo.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.2.4" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/DevIL/src-ILUT/msvc9/ILUT Unicode.rc b/DevIL/src-ILUT/msvc9/ILUT Unicode.rc deleted file mode 100644 index 6969c0f3..00000000 --- a/DevIL/src-ILUT/msvc9/ILUT Unicode.rc +++ /dev/null @@ -1,132 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,7,8 - PRODUCTVERSION 0,1,7,8 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x29L -#else - FILEFLAGS 0x28L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "ILUT: A portable image library in development" - VALUE "CompanyName", "Abysmal Software" - VALUE "FileDescription", "ILUT: A portable image library in development" - VALUE "FileVersion", "1.7.8" - VALUE "InternalName", "ILUT" - VALUE "LegalCopyright", "Copyright © 2000-2008" - VALUE "LegalTrademarks", "Under LGPL License" - VALUE "OriginalFilename", "ILUT.dll" - VALUE "PrivateBuild", "Open Source" - VALUE "ProductName", "Developer's Image Utility Toolkit Library" - VALUE "ProductVersion", "1.7.8 Unicode" - VALUE "SpecialBuild", "Unicode" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON "resources\\IL Logo.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.7.8" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/DevIL/src-ILUT/msvc9/ILUT Unicode.vcproj b/DevIL/src-ILUT/msvc9/ILUT Unicode.vcproj deleted file mode 100644 index e77dcabc..00000000 --- a/DevIL/src-ILUT/msvc9/ILUT Unicode.vcproj +++ /dev/null @@ -1,1451 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DevIL/src-ILUT/msvc9/ILUT.dsp b/DevIL/src-ILUT/msvc9/ILUT.dsp deleted file mode 100644 index 35c8c1f6..00000000 --- a/DevIL/src-ILUT/msvc9/ILUT.dsp +++ /dev/null @@ -1,228 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ILUT" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=ILUT - WIN32 DEBUG -!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE -!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl -!MESSAGE -!MESSAGE NMAKE /f "ILUT.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "ILUT.mak" CFG="ILUT - WIN32 DEBUG" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "ILUT - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ILUT - Win32 Dynamic" (basierend auf "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ILUT - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "ILUT" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ILUT - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "../../lib/debug" -# PROP BASE Intermediate_Dir "../src/obj/debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../lib/debug" -# PROP Intermediate_Dir "../src/obj/debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILUT_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILUT_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 devil.lib ilu.lib delayimp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\ilut.def" /out:"c:\path\ilut.dll" /pdbtype:sept /libpath:"../../lib" /delayload:d3d8.dll /delayload:sdl.dll -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "ILUT - Win32 Dynamic" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "../../lib" -# PROP BASE Intermediate_Dir "../src/obj/dynamic" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "../src/obj/dynamic" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILUT_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILUT_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 delayimp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\ilut.def" /out:"../../lib/ilut-l.dll" /delayload:d3d8.dll /delayload:sdl.dll -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 delayimp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\ilut.def" /out:"../../lib/ilut-l.dll" /delayload:d3d8.dll /delayload:sdl.dll -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -TargetName=ilut-l -SOURCE="$(InputPath)" -PostBuild_Cmds=..\..\projects\msvc\insdll.bat ..\..\lib\$(TargetName).dll -# End Special Build Tool - -!ELSEIF "$(CFG)" == "ILUT - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "../../lib" -# PROP BASE Intermediate_Dir "../src/obj" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "../src/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILUT_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../include" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ILUT_EXPORTS" /D "IL_STATIC_LIB" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 delayimp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\ilut.def" /delayload:d3d8.dll /delayload:sdl.dll -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 devil.lib ilu.lib kernel32.lib winspool.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib user32.lib gdi32.lib comdlg32.lib shell32.lib /nologo /dll /machine:I386 /def:".\ilut.def" /libpath:"../../lib" /delayload:d3d8.dll /delayload:sdl.dll -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy ..\..\lib\ilut.dll "C:\path\ilut.dll" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "ILUT - Win32 Debug" -# Name "ILUT - Win32 Dynamic" -# Name "ILUT - Win32 Release" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\ilut.def - -!IF "$(CFG)" == "ILUT - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "ILUT - Win32 Dynamic" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "ILUT - Win32 Release" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_directx.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_internal.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_main.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_opengl.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_sdlsurface.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_states.c -# End Source File -# Begin Source File - -SOURCE=..\src\ilut_win32.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\include\IL\devil_internal_exports.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\il\ilut.h -# End Source File -# Begin Source File - -SOURCE=..\include\ilut_internal.h -# End Source File -# Begin Source File - -SOURCE=..\include\ilut_opengl.h -# End Source File -# Begin Source File - -SOURCE=..\include\ilut_states.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=".\resources\IL Logo.ico" -# End Source File -# Begin Source File - -SOURCE=.\ILUT.rc -# End Source File -# End Group -# End Target -# End Project diff --git a/DevIL/src-ILUT/msvc9/ILUT.rc b/DevIL/src-ILUT/msvc9/ILUT.rc deleted file mode 100644 index 55045ff6..00000000 --- a/DevIL/src-ILUT/msvc9/ILUT.rc +++ /dev/null @@ -1,132 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,7,8 - PRODUCTVERSION 0,1,7,8 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x29L -#else - FILEFLAGS 0x28L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "ILUT: A portable image library in development" - VALUE "CompanyName", "Abysmal Software" - VALUE "FileDescription", "ILUT: A portable image library in development" - VALUE "FileVersion", "1.7.8" - VALUE "InternalName", "ILUT" - VALUE "LegalCopyright", "Copyright © 2000-2008" - VALUE "LegalTrademarks", "Under LGPL License" - VALUE "OriginalFilename", "ILUT.dll" - VALUE "PrivateBuild", "Open Source" - VALUE "ProductName", "Developer's Image Utility Toolkit Library" - VALUE "ProductVersion", "1.7.8 Ansi" - VALUE "SpecialBuild", "Ansi" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON "resources\\IL Logo.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.7.8" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/DevIL/src-ILUT/msvc9/ILUT.vcproj b/DevIL/src-ILUT/msvc9/ILUT.vcproj deleted file mode 100644 index a9cc7906..00000000 --- a/DevIL/src-ILUT/msvc9/ILUT.vcproj +++ /dev/null @@ -1,817 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DevIL/src-ILUT/msvc9/ilut.def b/DevIL/src-ILUT/msvc9/ilut.def deleted file mode 100644 index 096e3c4e..00000000 --- a/DevIL/src-ILUT/msvc9/ilut.def +++ /dev/null @@ -1,70 +0,0 @@ -; To remove an export, add a semicolon at the beginning of the line to comment it out. - -EXPORTS -ilutConvertToHBitmap - -ilutConvertSliceToHBitmap -;ilutConvertToSDLSurface -;ilutSDLSurfaceFromBitmap -;ilutSDLSurfaceLoadImage -;ilutD3D8LoadSurface -;ilutD3D8MipFunc -;ilutD3D8Texture -;ilutD3D8TexFromFile -;ilutD3D8VolumeTexture -;ilutD3D8VolTexFromFile -;ilutD3D8TexFromFileInMemory -;ilutD3D8VolTexFromFileInMemory -;ilutD3D8TexFromFileHandle -;ilutD3D8VolTexFromFileHandle -;ilutD3D8TexFromResource -;ilutD3D8VolTexFromResource -;ilutD3D9LoadSurface -;ilutD3D9MipFunc -;ilutD3D9Texture -;ilutD3D9TexFromFile -;ilutD3D9VolumeTexture -;ilutD3D9VolTexFromFile -;ilutD3D9TexFromFileInMemory -;ilutD3D9VolTexFromFileInMemory -;ilutD3D9TexFromFileHandle -;ilutD3D9VolTexFromFileHandle -;ilutD3D9TexFromResource -;ilutD3D9VolTexFromResource -ilutDisable -ilutEnable -ilutFreePaddedData -ilutGetBmpInfo -ilutGetBoolean -ilutGetBooleanv -ilutGetHPal -ilutGetInteger -ilutGetIntegerv -ilutGetPaddedData -ilutGetString -ilutGetWinClipboard -ilutInit -ilutIsDisabled -ilutIsEnabled -ilutLoadResource -ilutGLBindMipmaps -ilutGLBindTexImage -ilutGLBuildMipmaps -ilutGLLoadImage -ilutGLSaveImage -ilutGLScreen -ilutGLScreenie -ilutGLSetTex -ilutGLSubTex -ilutGLTexImage -ilutPopAttrib -ilutPushAttrib -ilutRenderer -ilutSetHBitmap -ilutSetHPal -ilutSetInteger -ilutSetWinClipboard -ilutWinLoadImage -ilutWinLoadUrl -ilutWinPrint -ilutWinSaveImage diff --git a/DevIL/src-ILUT/msvc9/resource.h b/DevIL/src-ILUT/msvc9/resource.h deleted file mode 100644 index 2efce68d..00000000 --- a/DevIL/src-ILUT/msvc9/resource.h +++ /dev/null @@ -1,17 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by ILUT.rc -// -#define IDC_OPENILUT 109 -#define IDI_ICON1 155 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/DevIL/src-ILUT/msvc9/resources/IL Logo.ico b/DevIL/src-ILUT/msvc9/resources/IL Logo.ico deleted file mode 100644 index e05ac9b1..00000000 Binary files a/DevIL/src-ILUT/msvc9/resources/IL Logo.ico and /dev/null differ diff --git a/DevIL/src-ILUT/msvc9/resources/ILUT.rc b/DevIL/src-ILUT/msvc9/resources/ILUT.rc deleted file mode 100644 index cde2e77b..00000000 --- a/DevIL/src-ILUT/msvc9/resources/ILUT.rc +++ /dev/null @@ -1,135 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,2,4 - PRODUCTVERSION 0,1,2,4 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x29L -#else - FILEFLAGS 0x28L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "ILUT: A great portable image library in development\0" - VALUE "CompanyName", "Abysmal Software\0" - VALUE "FileDescription", "ILUT: A great portable image library in development\0" - VALUE "FileVersion", "1.2.4\0" - VALUE "InternalName", "ILUT\0" - VALUE "LegalCopyright", "Copyright © 2000-2001\0" - VALUE "LegalTrademarks", "Under LGPL License\0" - VALUE "OriginalFilename", "ILUT.dll\0" - VALUE "PrivateBuild", "Open Source\0" - VALUE "ProductName", "Developer's Image Utility Toolkit Library\0" - VALUE "ProductVersion", "1.2.4\0" - VALUE "SpecialBuild", "eh?\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "resources\\IL Logo.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.2.4" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/DevIL/src-ILUT/pkgconfig/ILUT.pc.cmake.in b/DevIL/src-ILUT/pkgconfig/ILUT.pc.cmake.in new file mode 100644 index 00000000..c449dc45 --- /dev/null +++ b/DevIL/src-ILUT/pkgconfig/ILUT.pc.cmake.in @@ -0,0 +1,14 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +includedir=${prefix}/include +libdir=${exec_prefix}/lib + +Name: ILUT +Description: Developer's Image Library - ILUT part (connection to higher level libraries) +Version: @VERSION@ +URL: http://openil.sourceforge.net +Requires: IL ILU +Cflags: -I${includedir} +Libs: -L${libdir} -lILUT +Libs.private: -lIL -lILU + diff --git a/DevIL/src-ILUT/pkgconfig/README b/DevIL/src-ILUT/pkgconfig/README new file mode 100644 index 00000000..88788d45 --- /dev/null +++ b/DevIL/src-ILUT/pkgconfig/README @@ -0,0 +1,3 @@ +ILU.pc.cmake.in is the template file for building ILU.pc, which +provides pkg-config support for ILU. + -- cgit v1.2.1