IL: make config.h local to core il lib

4 files changed, 7 insertions, 30 deletions

diff --git a/DevIL/CMakeLists.txt b/DevIL/CMakeLists.txt
index 09b36f00..8d976652 100644
--- a/DevIL/CMakeLists.txt
+++ b/DevIL/CMakeLists.txt
@@ -6,11 +6,7 @@ project(ImageLib)
 # include our custom modules
 set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-#include (CheckIncludeFile)
-#include (CheckFunctionExists)
 include (TestBigEndian)
-include(CMakeDependentOption)
-#set(CMAKE_C_FLAGS "-std=c99")
 
 option(BUILD_SHARED_LIBS "Build with shared (.DLL .SO) libraries." ON)
 
@@ -100,20 +96,6 @@ endif(SQUISH_FOUND)
 
 
 
-# generate the config.h
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/IL/config.h.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/include/IL/config.h)
-
-#SET(DEVIL_INCS
-#
-#	${DEVIL_SOURCE_DIR}/include/IL/config.h
-#	${DEVIL_SOURCE_DIR}/include/IL/devil_internal_exports.h
-#	${DEVIL_SOURCE_DIR}/include/IL/il.h
-#	${DEVIL_SOURCE_DIR}/include/IL/il_wrap.h
-#	${DEVIL_SOURCE_DIR}/include/IL/ilu.h
-#	${DEVIL_SOURCE_DIR}/include/IL/ilu_region.h
-#	${DEVIL_SOURCE_DIR}/include/IL/ilut.h
-#)
-
 add_subdirectory(src-IL)
 #add_subdirectory(src-ILU)
 #add_subdirectory(src-ILUT)
diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
index a63251a1..c8cbab5c 100644
--- a/DevIL/src-IL/CMakeLists.txt
+++ b/DevIL/src-IL/CMakeLists.txt
@@ -11,6 +11,9 @@ include_directories(
 	${DevIL_SOURCE_DIR}/../include
 )
 
+# generate the config.h
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/include/config.h)
+
 #SET(DevIL_INC ${DEVIL_INCS} ${DEVIL_SRCS})
 
 set(LIBRARY_OUTPUT_PATH		${DEVIL_LIB_DEST_DIR}	)
@@ -39,9 +42,9 @@ source_group("Resource Files" FILES ${DevIL_RSRC} )
 source_group("Text Files" FILES ${DevIL_TXT} )
 
 if(BUILD_SHARED_LIBS)
-    add_library(IL SHARED ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT})
+    add_library(IL SHARED ${DevIL_SRCS} )
 else(BUILD_SHARED_LIBS)
-    add_library(IL ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT})
+    add_library(IL ${DevIL_SRCS} )
 endif(BUILD_SHARED_LIBS)
 
 
diff --git a/DevIL/include/IL/config.h.cmake.in b/DevIL/src-IL/include/config.h.cmake.in
index dec521e9..dec521e9 100644
--- a/DevIL/include/IL/config.h.cmake.in
+++ b/DevIL/src-IL/include/config.h.cmake.in
diff --git a/DevIL/src-IL/include/il_internal.h b/DevIL/src-IL/include/il_internal.h
index 9ca92433..450ac054 100644
--- a/DevIL/src-IL/include/il_internal.h
+++ b/DevIL/src-IL/include/il_internal.h
@@ -13,16 +13,8 @@
 #define INTERNAL_H
 #define _IL_BUILD_LIBRARY
 
-
-// Local headers
-/*#if (defined(_WIN32) || defined(_WIN64)) && !defined(HAVE_CONFIG_H)
-	#define HAVE_CONFIG_H
-#endif*/
-#ifdef HAVE_CONFIG_H //if we use autotools, we have HAVE_CONFIG_H defined and we have to look for it like that
-	#include <config.h>
-#else // If we do not use autotools, we have to point to (possibly different) config.h than in the opposite case
-	#include <IL/config.h>
-#endif
+// config.h is auto-generated
+#include "config.h"
 
 #if defined(__GNUC__) && __STDC_VERSION__ >= 199901L
     // this makes various common-but-not-C99 functions visable in gcc -std-c99