- Updating CMake file for Windows

- Starting change to C++ source files

4 files changed, 16 insertions, 7 deletions

diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
index 73d09561..c22e02c3 100644
--- a/DevIL/src-IL/CMakeLists.txt
+++ b/DevIL/src-IL/CMakeLists.txt
@@ -8,7 +8,7 @@ include (TestBigEndian)
 
 option(BUILD_SHARED_LIBS "Build with shared (.DLL .SO) libraries." ON)
 
-file(GLOB DevIL_SRCS src/*.c src/*.cpp)
+file(GLOB DevIL_SRCS src/*.c src/*.cpp msvc9/il.def)
 file(GLOB DevIL_INC include/*.h ../include/config.h ../include/IL/devil_internal_exports.h ../include/IL/il.h)
 file(GLOB DevIL_RSRC)
 file(GLOB DevIL_TXT)
@@ -129,11 +129,16 @@ else(SQUISH_FOUND)
     set(IL_USE_DXTC_SQUISH 0)
 endif(SQUISH_FOUND)
 
+set_target_properties(IL PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib")
+if(WIN32)
+	# Linux uses libIL.so, libILU.so, and libILUT.so, but Windows uses
+	#  DevIL.dll, ILU.dll, and ILUT.dll.
+	set_target_properties(IL PROPERTIES OUTPUT_NAME "DevIL")
+endif(WIN32)
 
-
-
-
-
+#if(COMPILER_MSVC)
+#    add_definitions(-DUNICODE -D_UNICODE)
+#endif()
 
 # configure include dirs and linkage for the optional external libs
 set(libs "")
diff --git a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt
index c54e9410..8e57a962 100644
--- a/DevIL/src-ILU/CMakeLists.txt
+++ b/DevIL/src-ILU/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 
 project(ILU)
 
-file(GLOB ILU_SRCS src/*.c)
+file(GLOB ILU_SRCS src/*.c msvc9/il.def)
 file(GLOB ILU_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilu.h)
 file(GLOB ILU_RSRC)
 
@@ -41,6 +41,8 @@ target_link_libraries(ILU
 configure_file( pkgconfig/ILU.pc.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/ILU.pc @ONLY)
 
+set_target_properties(ILU PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib")
+
 
 # Installation
 install (TARGETS ILU
diff --git a/DevIL/src-ILU/src/ilu_manip.c b/DevIL/src-ILU/src/ilu_manip.cpp
index 856b8c1b..856b8c1b 100644
--- a/DevIL/src-ILU/src/ilu_manip.c
+++ b/DevIL/src-ILU/src/ilu_manip.cpp
diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt
index f276d6a4..dba52386 100644
--- a/DevIL/src-ILUT/CMakeLists.txt
+++ b/DevIL/src-ILUT/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 
 project(ILUT)
 
-file(GLOB ILUT_SRCS src/*.c)
+file(GLOB ILUT_SRCS src/*.c msvc9/il.def)
 file(GLOB ILUT_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilut.h)
 file(GLOB ILUT_RSRC)
 
@@ -39,6 +39,8 @@ target_link_libraries(ILUT
 configure_file( pkgconfig/ILUT.pc.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc @ONLY)
 
+set_target_properties(ILUT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib")
+
 
 # Installation
 install (TARGETS ILUT