diff options
| author | Tom Gall <tom.gall@linaro.org> | 2011-07-05 20:54:28 +0000 |
|---|---|---|
| committer | Tom Gall <tom.gall@linaro.org> | 2011-07-05 20:54:28 +0000 |
| commit | 0c0e874b223e9ccc4a756c471f8792102b2d34a4 (patch) | |
| tree | 85967f13ba6c0132f6921d5264b1502f193a9b36 /simd | |
| parent | ca48cf7cf9749a5403386a1e3793a06fa0daf808 (diff) | |
1.1.1 from upstream at http://sourceforge.net/projects/libjpeg-turbo/
Diffstat (limited to 'simd')
| -rwxr-xr-x | simd/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | simd/Makefile.in | 2 | ||||
| -rw-r--r-- | simd/jsimdext.inc | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/simd/CMakeLists.txt b/simd/CMakeLists.txt index 5be325e..263579d 100755 --- a/simd/CMakeLists.txt +++ b/simd/CMakeLists.txt @@ -10,10 +10,6 @@ else() -I${CMAKE_CURRENT_SOURCE_DIR}/) endif() -if(MSVC) - set(NAFLAGS ${NAFLAGS} -DMSVC) -endif() - # This only works if building from the command line. There is currently no way # to set a variable's value based on the build type when using the MSVC IDE. if(CMAKE_BUILD_TYPE STREQUAL "Debug" @@ -36,7 +32,7 @@ else() endif() if(MSVC_IDE) - set(OBJDIR "${CMAKE_CURRENT_BINARY_DIR}/$(OutDir)") + set(OBJDIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}") else() set(OBJDIR ${CMAKE_CURRENT_BINARY_DIR}) endif() diff --git a/simd/Makefile.in b/simd/Makefile.in index 44e779c..bf14b58 100644 --- a/simd/Makefile.in +++ b/simd/Makefile.in @@ -143,8 +143,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -IS_WIN32_FALSE = @IS_WIN32_FALSE@ -IS_WIN32_TRUE = @IS_WIN32_TRUE@ JPEG_LIB_VERSION = @JPEG_LIB_VERSION@ JPEG_LIB_VERSION_DECIMAL = @JPEG_LIB_VERSION_DECIMAL@ LDFLAGS = @LDFLAGS@ diff --git a/simd/jsimdext.inc b/simd/jsimdext.inc index 4ea3d17..c4297f9 100644 --- a/simd/jsimdext.inc +++ b/simd/jsimdext.inc @@ -48,9 +48,7 @@ ; %define SEG_TEXT .text align=16 public use64 class=CODE %define SEG_CONST .rdata align=16 public use64 class=CONST -%ifdef MSVC %define EXTN(name) name ; foo() -> foo -%endif %elifdef OBJ32 ; ----(nasm -fobj -DOBJ32 ...)---------- ; * Borland C++ (Win32) |