diff options
| author | Denton Woods <denton.woods@gmail.com> | 2016-12-28 22:06:26 -0600 |
|---|---|---|
| committer | Denton Woods <denton.woods@gmail.com> | 2016-12-28 22:06:26 -0600 |
| commit | db15efa9ed8c45878a7ad58f21aeca70b06dde21 (patch) | |
| tree | 172f5911a07dcf59952afb2c0d5941dc9a223038 | |
| parent | f53fa32065eb4a0b0fb7b105562bb999cda12ed1 (diff) | |
| download | devil-db15efa9ed8c45878a7ad58f21aeca70b06dde21.tar.gz | |
- Updates for Windows CMake
| -rw-r--r-- | DevIL/src-IL/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | DevIL/src-ILU/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | DevIL/src-ILUT/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt index c22e02c3..2a197dc1 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 msvc9/il.def) +file(GLOB DevIL_SRCS src/*.c src/*.cpp) 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) @@ -22,7 +22,7 @@ if(WIN32) #ADD_DEFINITIONS(-DIL_DLL -DMNG_DLL -DMNG_USE_DLL -DJPEGDLL) add_definitions(-DIL_DLL -DJPEGSTATIC) # note: .def not used for now - __declspec() in source handles export. - # set(DevIL_SRCS ${DevIL_SRCS} msvc/il.def) + set(DevIL_SRCS ${DevIL_SRCS} msvc/il.def) set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" msvc/IL.rc) set(DevIL_TXT ${DevIL_TXT} ../AUTHORS ../ChangeLog ../CREDITS ../libraries.txt ../README ../README.cmake ../TODO) # SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:msvcrt.lib ") diff --git a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt index b73d9b7f..40500fe5 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 src/*.cpp msvc9/il.def) +file(GLOB ILU_SRCS src/*.c src/*.cpp) file(GLOB ILU_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilu.h) file(GLOB ILU_RSRC) @@ -13,7 +13,7 @@ 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_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) diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt index edcb02ba..1c57b654 100644 --- a/DevIL/src-ILUT/CMakeLists.txt +++ b/DevIL/src-ILUT/CMakeLists.txt @@ -14,7 +14,7 @@ if(WIN32) add_definitions(-DIL_USE_PRAGMA_LIBS) if(BUILD_SHARED_LIBS) add_definitions(-DILUT_DLL) - #set(ILUT_SRCS ${ILUT_SRCS} msvc/ilut.def) + 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) |