diff options
| author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-10-15 05:33:21 +0000 |
|---|---|---|
| committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-10-15 05:33:21 +0000 |
| commit | 7c271508800907e3bfca5fff43e4e78b65682f4c (patch) | |
| tree | 4fb3927a48c1b20b32d69885d1640ce5794b4158 /trunk/sharedlib | |
| parent | ea1d2edd2443332dd05ab810852c7328877cbd86 (diff) | |
Export the correct symbols from the Windows DLL when built with libjpeg v7 or v8b emulation
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@260 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/sharedlib')
| -rwxr-xr-x | trunk/sharedlib/CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/trunk/sharedlib/CMakeLists.txt b/trunk/sharedlib/CMakeLists.txt index b70f9bd..c4e2940 100755 --- a/trunk/sharedlib/CMakeLists.txt +++ b/trunk/sharedlib/CMakeLists.txt @@ -21,14 +21,13 @@ foreach(src ${JPEG_SOURCES}) set(JPEG_SRCS ${JPEG_SRCS} ${CMAKE_SOURCE_DIR}/${src})
endforeach()
-set(JPEG_DEF ../win/jpeg.def)
-
if(WITH_SIMD)
# This tells CMake that the "source" files haven't been generated yet
set_source_files_properties(${SIMD_OBJS} PROPERTIES GENERATED 1)
endif()
-add_library(jpeg SHARED ${JPEG_SRCS} ${SIMD_OBJS} ${JPEG_DEF})
+add_library(jpeg SHARED ${JPEG_SRCS} ${SIMD_OBJS}
+ ${CMAKE_SOURCE_DIR}/win/jpeg${DLL_VERSION}.def)
if(MSVC)
set_target_properties(jpeg PROPERTIES SUFFIX ${DLL_VERSION}.dll)
elseif(MINGW OR CYGWIN)
|