diff options
| author | Ben Campbell <ben@scumways.com> | 2016-07-25 22:55:38 +1200 |
|---|---|---|
| committer | Ben Campbell <ben@scumways.com> | 2016-07-25 22:55:38 +1200 |
| commit | 0d92994d79397c18d85feb67f741398f297e617b (patch) | |
| tree | 1f6d06513570323f1beb5bf3721a7f43f6a9acbd /DevIL | |
| parent | 2d24e9550d427a4b7383c6db2e2edaf65f40622b (diff) | |
| download | devil-0d92994d79397c18d85feb67f741398f297e617b.tar.gz | |
minor fixes for building with visual studio
il_manip.c was including IL/il.h, which includes a pragma to link with
DevIL.lib, so the library was trying to link with itself and failing.
Also removed references to some of the removed READMEs, which were
tripping up cmake.
Diffstat (limited to 'DevIL')
| -rw-r--r-- | DevIL/src-IL/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | DevIL/src-IL/src/il_manip.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt index 08a75a14..334121d6 100644 --- a/DevIL/src-IL/CMakeLists.txt +++ b/DevIL/src-IL/CMakeLists.txt @@ -25,7 +25,7 @@ IF(WIN32) ADD_DEFINITIONS(-DIL_DLL -DJPEGSTATIC) 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 ../MSVC++.txt ../README.unix ../README.win ../TODO) + 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 ") SET(CMAKE_C_FLAGS_RELEASE "/MT /O2") ELSE(BUILD_SHARED_LIBS) diff --git a/DevIL/src-IL/src/il_manip.c b/DevIL/src-IL/src/il_manip.c index 7f7d4bdd..5d0b9b96 100644 --- a/DevIL/src-IL/src/il_manip.c +++ b/DevIL/src-IL/src/il_manip.c @@ -10,7 +10,6 @@ // //----------------------------------------------------------------------------- -#include <IL/il.h> #include "il_internal.h" |