From db45e9320b9e70d675c94d7db0ad77fa23eda029 Mon Sep 17 00:00:00 2001 From: Peter Eszlari Date: Sat, 20 Feb 2021 11:21:09 +0100 Subject: [PATCH] fix MSVC compilation The following filters needed to be disabled because of Variable Length Arrays (VLA), but are enabled when compiling with clang-cl: * curves * d90stairsteppingfix * dither --- .gitignore | 4 + CMakeLists.txt | 9 +- cmake/modules/LibFindMacros.cmake | 6 - include/msvc/inttypes.h | 305 ------------------ include/msvc/stdint.h | 247 -------------- src/CMakeLists.txt | 4 +- src/filter/3dflippo/CMakeLists.txt | 1 - src/filter/RGB/CMakeLists.txt | 1 - src/filter/alpha0ps/CMakeLists.txt | 9 +- src/filter/alpha0ps/alpha0ps.c | 3 +- src/filter/balanc0r/CMakeLists.txt | 1 - src/filter/bgsubtract0r/CMakeLists.txt | 1 - src/filter/blur/CMakeLists.txt | 5 +- src/filter/blur/IIRblur.c | 3 +- src/filter/brightness/CMakeLists.txt | 1 - src/filter/bw0r/CMakeLists.txt | 1 - src/filter/c0rners/CMakeLists.txt | 1 - src/filter/c0rners/interp.h | 5 - src/filter/cairogradient/CMakeLists.txt | 1 - src/filter/cairoimagegrid/CMakeLists.txt | 1 - src/filter/cluster/CMakeLists.txt | 1 - src/filter/colgate/CMakeLists.txt | 5 +- src/filter/coloradj/CMakeLists.txt | 5 +- src/filter/colordistance/CMakeLists.txt | 1 - src/filter/colordistance/colordistance.c | 6 - src/filter/colorhalftone/CMakeLists.txt | 1 - src/filter/colorize/CMakeLists.txt | 1 - src/filter/colortap/CMakeLists.txt | 1 - src/filter/contrast0r/CMakeLists.txt | 1 - src/filter/curves/CMakeLists.txt | 5 +- src/filter/d90stairsteppingfix/CMakeLists.txt | 4 + src/filter/defish0r/CMakeLists.txt | 5 +- src/filter/defish0r/defish0r.c | 4 - src/filter/denoise/CMakeLists.txt | 5 +- src/filter/distort0r/CMakeLists.txt | 1 - src/filter/dither/CMakeLists.txt | 5 +- src/filter/emboss/CMakeLists.txt | 1 - src/filter/flippo/CMakeLists.txt | 1 - src/filter/gamma/CMakeLists.txt | 5 +- src/filter/glitch0r/CMakeLists.txt | 1 - src/filter/glow/CMakeLists.txt | 1 - src/filter/host_param_test/CMakeLists.txt | 1 - src/filter/hueshift0r/CMakeLists.txt | 5 +- src/filter/invert0r/CMakeLists.txt | 1 - src/filter/keyspillm0pup/CMakeLists.txt | 1 - src/filter/lenscorrection/CMakeLists.txt | 1 - src/filter/letterb0xed/CMakeLists.txt | 1 - src/filter/levels/CMakeLists.txt | 1 - src/filter/lightgraffiti/lightgraffiti.cpp | 8 +- src/filter/luminance/CMakeLists.txt | 1 - src/filter/mask0mate/CMakeLists.txt | 1 - src/filter/measure/CMakeLists.txt | 1 - src/filter/medians/CMakeLists.txt | 1 - src/filter/medians/ctmf.h | 10 - src/filter/normaliz0r/CMakeLists.txt | 1 - src/filter/perspective/CMakeLists.txt | 1 - src/filter/perspective/perspective.c | 6 - src/filter/pixeliz0r/CMakeLists.txt | 1 - src/filter/posterize/CMakeLists.txt | 1 - src/filter/rgbnoise/CMakeLists.txt | 5 +- src/filter/rgbparade/CMakeLists.txt | 1 - src/filter/rgbsplit0r/CMakeLists.txt | 1 - src/filter/saturat0r/CMakeLists.txt | 1 - src/filter/scale0tilt/CMakeLists.txt | 1 - src/filter/select0r/CMakeLists.txt | 1 - src/filter/sharpness/CMakeLists.txt | 1 - src/filter/sigmoidaltransfer/CMakeLists.txt | 1 - src/filter/softglow/CMakeLists.txt | 1 - src/filter/spillsupress/CMakeLists.txt | 1 - src/filter/squareblur/CMakeLists.txt | 1 - src/filter/tehroxx0r/CMakeLists.txt | 1 - src/filter/three_point_balance/CMakeLists.txt | 1 - src/filter/threshold0r/CMakeLists.txt | 1 - src/filter/tint0r/CMakeLists.txt | 1 - src/filter/transparency/CMakeLists.txt | 1 - src/filter/vectorscope/CMakeLists.txt | 1 - src/filter/vertigo/CMakeLists.txt | 1 - src/filter/vignette/vignette.cpp | 3 + src/generator/ising0r/CMakeLists.txt | 1 - src/generator/partik0l/partik0l.cpp | 8 +- src/generator/test_pat/CMakeLists.txt | 5 +- src/mixer2/alphainjection/CMakeLists.txt | 1 - src/mixer2/cairoaffineblend/CMakeLists.txt | 1 - src/mixer2/cairoblend/CMakeLists.txt | 1 - src/mixer2/composition/CMakeLists.txt | 1 - src/mixer2/uvmap/CMakeLists.txt | 1 - src/mixer2/uvmap/uvmap.c | 6 - src/mixer3/RGB/CMakeLists.txt | 1 - 88 files changed, 72 insertions(+), 691 deletions(-) delete mode 100644 include/msvc/inttypes.h delete mode 100644 include/msvc/stdint.h diff --git a/.gitignore b/.gitignore index abe776c..2f7d5bb 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,7 @@ TAGS ylwrap frei0r.pc doc/html +/build/ +/out/ +/.vs/ +CMakeSettings.json diff --git a/CMakeLists.txt b/CMakeLists.txt index fc1b851..f4cbf82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,12 @@ -cmake_minimum_required (VERSION 2.8) -include(GNUInstallDirs) +cmake_minimum_required (VERSION 3.0) list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) project (frei0r) set (VERSION 1.8) +include(GNUInstallDirs) + option (WITHOUT_OPENCV "Disable plugins dependent upon OpenCV" OFF) if (NOT WITHOUT_OPENCV) find_package (OpenCV) @@ -21,10 +22,6 @@ endif () include_directories (AFTER include) -if (MSVC) - include_directories (include/msvc) -endif (MSVC) - if (NOT CMAKE_BUILD_TYPE) set (CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." diff --git a/cmake/modules/LibFindMacros.cmake b/cmake/modules/LibFindMacros.cmake index 69975c5..85601ed 100644 --- a/cmake/modules/LibFindMacros.cmake +++ b/cmake/modules/LibFindMacros.cmake @@ -79,12 +79,6 @@ endmacro (libfind_process) macro(libfind_library PREFIX basename) set(TMP "") - if(MSVC80) - set(TMP -vc80) - endif(MSVC80) - if(MSVC90) - set(TMP -vc90) - endif(MSVC90) set(${PREFIX}_LIBNAMES ${basename}${TMP}) if(${ARGC} GREATER 2) set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2}) diff --git a/include/msvc/inttypes.h b/include/msvc/inttypes.h deleted file mode 100644 index ead903f..0000000 --- a/include/msvc/inttypes.h +++ /dev/null @@ -1,305 +0,0 @@ -// ISO C9x compliant inttypes.h for Microsoft Visual Studio -// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 -// -// Copyright (c) 2006 Alexander Chemeris -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. The name of the author may be used to endorse or promote products -// derived from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MSC_VER // [ -#error "Use this header only with Microsoft Visual C++ compilers!" -#endif // _MSC_VER ] - -#ifndef _MSC_INTTYPES_H_ // [ -#define _MSC_INTTYPES_H_ - -#if _MSC_VER > 1000 -#pragma once -#endif - -#include "stdint.h" - -// 7.8 Format conversion of integer types - -typedef struct { - intmax_t quot; - intmax_t rem; -} imaxdiv_t; - -// 7.8.1 Macros for format specifiers - -#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [ See footnote 185 at page 198 - -// The fprintf macros for signed integers are: -#define PRId8 "d" -#define PRIi8 "i" -#define PRIdLEAST8 "d" -#define PRIiLEAST8 "i" -#define PRIdFAST8 "d" -#define PRIiFAST8 "i" - -#define PRId16 "hd" -#define PRIi16 "hi" -#define PRIdLEAST16 "hd" -#define PRIiLEAST16 "hi" -#define PRIdFAST16 "hd" -#define PRIiFAST16 "hi" - -#define PRId32 "I32d" -#define PRIi32 "I32i" -#define PRIdLEAST32 "I32d" -#define PRIiLEAST32 "I32i" -#define PRIdFAST32 "I32d" -#define PRIiFAST32 "I32i" - -#define PRId64 "I64d" -#define PRIi64 "I64i" -#define PRIdLEAST64 "I64d" -#define PRIiLEAST64 "I64i" -#define PRIdFAST64 "I64d" -#define PRIiFAST64 "I64i" - -#define PRIdMAX "I64d" -#define PRIiMAX "I64i" - -#define PRIdPTR "Id" -#define PRIiPTR "Ii" - -// The fprintf macros for unsigned integers are: -#define PRIo8 "o" -#define PRIu8 "u" -#define PRIx8 "x" -#define PRIX8 "X" -#define PRIoLEAST8 "o" -#define PRIuLEAST8 "u" -#define PRIxLEAST8 "x" -#define PRIXLEAST8 "X" -#define PRIoFAST8 "o" -#define PRIuFAST8 "u" -#define PRIxFAST8 "x" -#define PRIXFAST8 "X" - -#define PRIo16 "ho" -#define PRIu16 "hu" -#define PRIx16 "hx" -#define PRIX16 "hX" -#define PRIoLEAST16 "ho" -#define PRIuLEAST16 "hu" -#define PRIxLEAST16 "hx" -#define PRIXLEAST16 "hX" -#define PRIoFAST16 "ho" -#define PRIuFAST16 "hu" -#define PRIxFAST16 "hx" -#define PRIXFAST16 "hX" - -#define PRIo32 "I32o" -#define PRIu32 "I32u" -#define PRIx32 "I32x" -#define PRIX32 "I32X" -#define PRIoLEAST32 "I32o" -#define PRIuLEAST32 "I32u" -#define PRIxLEAST32 "I32x" -#define PRIXLEAST32 "I32X" -#define PRIoFAST32 "I32o" -#define PRIuFAST32 "I32u" -#define PRIxFAST32 "I32x" -#define PRIXFAST32 "I32X" - -#define PRIo64 "I64o" -#define PRIu64 "I64u" -#define PRIx64 "I64x" -#define PRIX64 "I64X" -#define PRIoLEAST64 "I64o" -#define PRIuLEAST64 "I64u" -#define PRIxLEAST64 "I64x" -#define PRIXLEAST64 "I64X" -#define PRIoFAST64 "I64o" -#define PRIuFAST64 "I64u" -#define PRIxFAST64 "I64x" -#define PRIXFAST64 "I64X" - -#define PRIoMAX "I64o" -#define PRIuMAX "I64u" -#define PRIxMAX "I64x" -#define PRIXMAX "I64X" - -#define PRIoPTR "Io" -#define PRIuPTR "Iu" -#define PRIxPTR "Ix" -#define PRIXPTR "IX" - -// The fscanf macros for signed integers are: -#define SCNd8 "d" -#define SCNi8 "i" -#define SCNdLEAST8 "d" -#define SCNiLEAST8 "i" -#define SCNdFAST8 "d" -#define SCNiFAST8 "i" - -#define SCNd16 "hd" -#define SCNi16 "hi" -#define SCNdLEAST16 "hd" -#define SCNiLEAST16 "hi" -#define SCNdFAST16 "hd" -#define SCNiFAST16 "hi" - -#define SCNd32 "ld" -#define SCNi32 "li" -#define SCNdLEAST32 "ld" -#define SCNiLEAST32 "li" -#define SCNdFAST32 "ld" -#define SCNiFAST32 "li" - -#define SCNd64 "I64d" -#define SCNi64 "I64i" -#define SCNdLEAST64 "I64d" -#define SCNiLEAST64 "I64i" -#define SCNdFAST64 "I64d" -#define SCNiFAST64 "I64i" - -#define SCNdMAX "I64d" -#define SCNiMAX "I64i" - -#ifdef _WIN64 // [ -# define SCNdPTR "I64d" -# define SCNiPTR "I64i" -#else // _WIN64 ][ -# define SCNdPTR "ld" -# define SCNiPTR "li" -#endif // _WIN64 ] - -// The fscanf macros for unsigned integers are: -#define SCNo8 "o" -#define SCNu8 "u" -#define SCNx8 "x" -#define SCNX8 "X" -#define SCNoLEAST8 "o" -#define SCNuLEAST8 "u" -#define SCNxLEAST8 "x" -#define SCNXLEAST8 "X" -#define SCNoFAST8 "o" -#define SCNuFAST8 "u" -#define SCNxFAST8 "x" -#define SCNXFAST8 "X" - -#define SCNo16 "ho" -#define SCNu16 "hu" -#define SCNx16 "hx" -#define SCNX16 "hX" -#define SCNoLEAST16 "ho" -#define SCNuLEAST16 "hu" -#define SCNxLEAST16 "hx" -#define SCNXLEAST16 "hX" -#define SCNoFAST16 "ho" -#define SCNuFAST16 "hu" -#define SCNxFAST16 "hx" -#define SCNXFAST16 "hX" - -#define SCNo32 "lo" -#define SCNu32 "lu" -#define SCNx32 "lx" -#define SCNX32 "lX" -#define SCNoLEAST32 "lo" -#define SCNuLEAST32 "lu" -#define SCNxLEAST32 "lx" -#define SCNXLEAST32 "lX" -#define SCNoFAST32 "lo" -#define SCNuFAST32 "lu" -#define SCNxFAST32 "lx" -#define SCNXFAST32 "lX" - -#define SCNo64 "I64o" -#define SCNu64 "I64u" -#define SCNx64 "I64x" -#define SCNX64 "I64X" -#define SCNoLEAST64 "I64o" -#define SCNuLEAST64 "I64u" -#define SCNxLEAST64 "I64x" -#define SCNXLEAST64 "I64X" -#define SCNoFAST64 "I64o" -#define SCNuFAST64 "I64u" -#define SCNxFAST64 "I64x" -#define SCNXFAST64 "I64X" - -#define SCNoMAX "I64o" -#define SCNuMAX "I64u" -#define SCNxMAX "I64x" -#define SCNXMAX "I64X" - -#ifdef _WIN64 // [ -# define SCNoPTR "I64o" -# define SCNuPTR "I64u" -# define SCNxPTR "I64x" -# define SCNXPTR "I64X" -#else // _WIN64 ][ -# define SCNoPTR "lo" -# define SCNuPTR "lu" -# define SCNxPTR "lx" -# define SCNXPTR "lX" -#endif // _WIN64 ] - -#endif // __STDC_FORMAT_MACROS ] - -// 7.8.2 Functions for greatest-width integer types - -// 7.8.2.1 The imaxabs function -#define imaxabs _abs64 - -// 7.8.2.2 The imaxdiv function - -// This is modified version of div() function from Microsoft's div.c found -// in %MSVC.NET%\crt\src\div.c -#ifdef STATIC_IMAXDIV // [ -static -#else // STATIC_IMAXDIV ][ -_inline -#endif // STATIC_IMAXDIV ] -imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom) -{ - imaxdiv_t result; - - result.quot = numer / denom; - result.rem = numer % denom; - - if (numer < 0 && result.rem > 0) { - // did division wrong; must fix up - ++result.quot; - result.rem -= denom; - } - - return result; -} - -// 7.8.2.3 The strtoimax and strtoumax functions -#define strtoimax _strtoi64 -#define strtoumax _strtoui64 - -// 7.8.2.4 The wcstoimax and wcstoumax functions -#define wcstoimax _wcstoi64 -#define wcstoumax _wcstoui64 - - -#endif // _MSC_INTTYPES_H_ ] diff --git a/include/msvc/stdint.h b/include/msvc/stdint.h deleted file mode 100644 index c66fbb8..0000000 --- a/include/msvc/stdint.h +++ /dev/null @@ -1,247 +0,0 @@ -// ISO C9x compliant stdint.h for Microsoft Visual Studio -// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 -// -// Copyright (c) 2006-2008 Alexander Chemeris -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. The name of the author may be used to endorse or promote products -// derived from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MSC_VER // [ -#error "Use this header only with Microsoft Visual C++ compilers!" -#endif // _MSC_VER ] - -#ifndef _MSC_STDINT_H_ // [ -#define _MSC_STDINT_H_ - -#if _MSC_VER > 1000 -#pragma once -#endif - -#include - -// For Visual Studio 6 in C++ mode and for many Visual Studio versions when -// compiling for ARM we should wrap include with 'extern "C++" {}' -// or compiler give many errors like this: -// error C2733: second C linkage of overloaded function 'wmemchr' not allowed -#ifdef __cplusplus -extern "C" { -#endif -# include -#ifdef __cplusplus -} -#endif - -// Define _W64 macros to mark types changing their size, like intptr_t. -#ifndef _W64 -# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300 -# define _W64 __w64 -# else -# define _W64 -# endif -#endif - - -// 7.18.1 Integer types - -// 7.18.1.1 Exact-width integer types - -// Visual Studio 6 and Embedded Visual C++ 4 doesn't -// realize that, e.g. char has the same size as __int8 -// so we give up on __intX for them. -#if (_MSC_VER < 1300) - typedef signed char int8_t; - typedef signed short int16_t; - typedef signed int int32_t; - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - typedef unsigned int uint32_t; -#else - typedef signed __int8 int8_t; - typedef signed __int16 int16_t; - typedef signed __int32 int32_t; - typedef unsigned __int8 uint8_t; - typedef unsigned __int16 uint16_t; - typedef unsigned __int32 uint32_t; -#endif -typedef signed __int64 int64_t; -typedef unsigned __int64 uint64_t; - - -// 7.18.1.2 Minimum-width integer types -typedef int8_t int_least8_t; -typedef int16_t int_least16_t; -typedef int32_t int_least32_t; -typedef int64_t int_least64_t; -typedef uint8_t uint_least8_t; -typedef uint16_t uint_least16_t; -typedef uint32_t uint_least32_t; -typedef uint64_t uint_least64_t; - -// 7.18.1.3 Fastest minimum-width integer types -typedef int8_t int_fast8_t; -typedef int16_t int_fast16_t; -typedef int32_t int_fast32_t; -typedef int64_t int_fast64_t; -typedef uint8_t uint_fast8_t; -typedef uint16_t uint_fast16_t; -typedef uint32_t uint_fast32_t; -typedef uint64_t uint_fast64_t; - -// 7.18.1.4 Integer types capable of holding object pointers -#ifdef _WIN64 // [ - typedef signed __int64 intptr_t; - typedef unsigned __int64 uintptr_t; -#else // _WIN64 ][ - typedef _W64 signed int intptr_t; - typedef _W64 unsigned int uintptr_t; -#endif // _WIN64 ] - -// 7.18.1.5 Greatest-width integer types -typedef int64_t intmax_t; -typedef uint64_t uintmax_t; - - -// 7.18.2 Limits of specified-width integer types - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259 - -// 7.18.2.1 Limits of exact-width integer types -#define INT8_MIN ((int8_t)_I8_MIN) -#define INT8_MAX _I8_MAX -#define INT16_MIN ((int16_t)_I16_MIN) -#define INT16_MAX _I16_MAX -#define INT32_MIN ((int32_t)_I32_MIN) -#define INT32_MAX _I32_MAX -#define INT64_MIN ((int64_t)_I64_MIN) -#define INT64_MAX _I64_MAX -#define UINT8_MAX _UI8_MAX -#define UINT16_MAX _UI16_MAX -#define UINT32_MAX _UI32_MAX -#define UINT64_MAX _UI64_MAX - -// 7.18.2.2 Limits of minimum-width integer types -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST8_MAX INT8_MAX -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST16_MAX INT16_MAX -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST32_MAX INT32_MAX -#define INT_LEAST64_MIN INT64_MIN -#define INT_LEAST64_MAX INT64_MAX -#define UINT_LEAST8_MAX UINT8_MAX -#define UINT_LEAST16_MAX UINT16_MAX -#define UINT_LEAST32_MAX UINT32_MAX -#define UINT_LEAST64_MAX UINT64_MAX - -// 7.18.2.3 Limits of fastest minimum-width integer types -#define INT_FAST8_MIN INT8_MIN -#define INT_FAST8_MAX INT8_MAX -#define INT_FAST16_MIN INT16_MIN -#define INT_FAST16_MAX INT16_MAX -#define INT_FAST32_MIN INT32_MIN -#define INT_FAST32_MAX INT32_MAX -#define INT_FAST64_MIN INT64_MIN -#define INT_FAST64_MAX INT64_MAX -#define UINT_FAST8_MAX UINT8_MAX -#define UINT_FAST16_MAX UINT16_MAX -#define UINT_FAST32_MAX UINT32_MAX -#define UINT_FAST64_MAX UINT64_MAX - -// 7.18.2.4 Limits of integer types capable of holding object pointers -#ifdef _WIN64 // [ -# define INTPTR_MIN INT64_MIN -# define INTPTR_MAX INT64_MAX -# define UINTPTR_MAX UINT64_MAX -#else // _WIN64 ][ -# define INTPTR_MIN INT32_MIN -# define INTPTR_MAX INT32_MAX -# define UINTPTR_MAX UINT32_MAX -#endif // _WIN64 ] - -// 7.18.2.5 Limits of greatest-width integer types -#define INTMAX_MIN INT64_MIN -#define INTMAX_MAX INT64_MAX -#define UINTMAX_MAX UINT64_MAX - -// 7.18.3 Limits of other integer types - -#ifdef _WIN64 // [ -# define PTRDIFF_MIN _I64_MIN -# define PTRDIFF_MAX _I64_MAX -#else // _WIN64 ][ -# define PTRDIFF_MIN _I32_MIN -# define PTRDIFF_MAX _I32_MAX -#endif // _WIN64 ] - -#define SIG_ATOMIC_MIN INT_MIN -#define SIG_ATOMIC_MAX INT_MAX - -#ifndef SIZE_MAX // [ -# ifdef _WIN64 // [ -# define SIZE_MAX _UI64_MAX -# else // _WIN64 ][ -# define SIZE_MAX _UI32_MAX -# endif // _WIN64 ] -#endif // SIZE_MAX ] - -// WCHAR_MIN and WCHAR_MAX are also defined in -#ifndef WCHAR_MIN // [ -# define WCHAR_MIN 0 -#endif // WCHAR_MIN ] -#ifndef WCHAR_MAX // [ -# define WCHAR_MAX _UI16_MAX -#endif // WCHAR_MAX ] - -#define WINT_MIN 0 -#define WINT_MAX _UI16_MAX - -#endif // __STDC_LIMIT_MACROS ] - - -// 7.18.4 Limits of other integer types - -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260 - -// 7.18.4.1 Macros for minimum-width integer constants - -#define INT8_C(val) val##i8 -#define INT16_C(val) val##i16 -#define INT32_C(val) val##i32 -#define INT64_C(val) val##i64 - -#define UINT8_C(val) val##ui8 -#define UINT16_C(val) val##ui16 -#define UINT32_C(val) val##ui32 -#define UINT64_C(val) val##ui64 - -// 7.18.4.2 Macros for greatest-width integer constants -#define INTMAX_C INT64_C -#define UINTMAX_C UINT64_C - -#endif // __STDC_CONSTANT_MACROS ] - - -#endif // _MSC_STDINT_H_ ] diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 39b1171..9d8baf4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,7 @@ set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed") -link_libraries(m) +if(NOT MSVC) + link_libraries(m) +endif() add_subdirectory (filter) add_subdirectory (generator) add_subdirectory (mixer2) diff --git a/src/filter/3dflippo/CMakeLists.txt b/src/filter/3dflippo/CMakeLists.txt index 8089bfa..4d2878e 100644 --- a/src/filter/3dflippo/CMakeLists.txt +++ b/src/filter/3dflippo/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES 3dflippo.c) set (TARGET 3dflippo) if (MSVC) - set_source_files_properties (3dflippo.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/RGB/CMakeLists.txt b/src/filter/RGB/CMakeLists.txt index 596fa12..3febb37 100644 --- a/src/filter/RGB/CMakeLists.txt +++ b/src/filter/RGB/CMakeLists.txt @@ -3,7 +3,6 @@ set (G_SOURCES G.c) set (B_SOURCES B.c) if (MSVC) - set_source_files_properties (R.c G.c B.c PROPERTIES LANGUAGE CXX) set (R_SOURCES ${R_SOURCES} ${FREI0R_DEF}) set (G_SOURCES ${G_SOURCES} ${FREI0R_DEF}) set (B_SOURCES ${B_SOURCES} ${FREI0R_DEF}) diff --git a/src/filter/alpha0ps/CMakeLists.txt b/src/filter/alpha0ps/CMakeLists.txt index d21422e..c5a69f3 100644 --- a/src/filter/alpha0ps/CMakeLists.txt +++ b/src/filter/alpha0ps/CMakeLists.txt @@ -3,7 +3,6 @@ set (G_SOURCES alphagrad.c) set (S_SOURCES alphaspot.c) if (MSVC) - set_source_files_properties (alpha0ps.c alphagrad.c alphaspot.c PROPERTIES LANGUAGE CXX) set (O_SOURCES ${O_SOURCES} ${FREI0R_DEF}) set (G_SOURCES ${G_SOURCES} ${FREI0R_DEF}) set (S_SOURCES ${S_SOURCES} ${FREI0R_DEF}) @@ -13,9 +12,11 @@ add_library (alpha0ps MODULE ${O_SOURCES}) add_library (alphagrad MODULE ${G_SOURCES}) add_library (alphaspot MODULE ${S_SOURCES}) -target_link_libraries(alpha0ps -lm) -target_link_libraries(alphagrad -lm) -target_link_libraries(alphaspot -lm) +if(NOT MSVC) + target_link_libraries(alpha0ps -lm) + target_link_libraries(alphagrad -lm) + target_link_libraries(alphaspot -lm) +endif() set_target_properties (alpha0ps PROPERTIES PREFIX "") set_target_properties (alphagrad PROPERTIES PREFIX "") diff --git a/src/filter/alpha0ps/alpha0ps.c b/src/filter/alpha0ps/alpha0ps.c index f532994..e4ac4e6 100644 --- a/src/filter/alpha0ps/alpha0ps.c +++ b/src/filter/alpha0ps/alpha0ps.c @@ -380,11 +380,12 @@ float AitNev3(int t, float xt[], float yt[], float x) { float p[10]; int i,j,m; + float zero = 0.0f; // MSVC doesn't allow division through a zero literal, but allows it through non-const variable set to zero if ((xxt[t-1])) { // printf("\n\n x=%f je izven mej tabele!",x); - return 1.0/0.0; + return 1.0/zero; } //poisce, katere tocke bo uporabil diff --git a/src/filter/balanc0r/CMakeLists.txt b/src/filter/balanc0r/CMakeLists.txt index 3036124..7d1df11 100644 --- a/src/filter/balanc0r/CMakeLists.txt +++ b/src/filter/balanc0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES balanc0r.c) set (TARGET balanc0r) if (MSVC) - set_source_files_properties (balanc0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/bgsubtract0r/CMakeLists.txt b/src/filter/bgsubtract0r/CMakeLists.txt index 2a9979f..1aefb27 100644 --- a/src/filter/bgsubtract0r/CMakeLists.txt +++ b/src/filter/bgsubtract0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES bgsubtract0r.c) set (TARGET bgsubtract0r) if (MSVC) - set_source_files_properties (bgsubtract0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/blur/CMakeLists.txt b/src/filter/blur/CMakeLists.txt index d1fd4b7..dd30e7e 100644 --- a/src/filter/blur/CMakeLists.txt +++ b/src/filter/blur/CMakeLists.txt @@ -2,11 +2,12 @@ set (SOURCES IIRblur.c fibe.h) set (TARGET IIRblur) if (MSVC) - set_source_files_properties (IIRblur.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) -link_libraries(m) +if(NOT MSVC) + link_libraries(m) +endif() add_library (${TARGET} MODULE ${SOURCES}) set_target_properties (${TARGET} PROPERTIES PREFIX "") diff --git a/src/filter/blur/IIRblur.c b/src/filter/blur/IIRblur.c index 8cd544a..4eb9055 100644 --- a/src/filter/blur/IIRblur.c +++ b/src/filter/blur/IIRblur.c @@ -80,11 +80,12 @@ float AitNev3(int t, float xt[], float yt[], float x) { float p[10]; int i,j,m; + float zero = 0.0f; // MSVC doesn't allow division through a zero literal, but allows it through non-const variable set to zero if ((xxt[t-1])) { // printf("\n\n x=%f je izven mej tabele!",x); - return 1.0/0.0; + return 1.0/zero; } //poisce, katere tocke bo uporabil diff --git a/src/filter/brightness/CMakeLists.txt b/src/filter/brightness/CMakeLists.txt index cacfcaa..7ec4c88 100644 --- a/src/filter/brightness/CMakeLists.txt +++ b/src/filter/brightness/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES brightness.c) set (TARGET brightness) if (MSVC) - set_source_files_properties (brightness.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/bw0r/CMakeLists.txt b/src/filter/bw0r/CMakeLists.txt index 7ad040e..e97b34b 100644 --- a/src/filter/bw0r/CMakeLists.txt +++ b/src/filter/bw0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES bw0r.c) set (TARGET bw0r) if (MSVC) - set_source_files_properties (bw0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/c0rners/CMakeLists.txt b/src/filter/c0rners/CMakeLists.txt index fba422d..0ec0abe 100644 --- a/src/filter/c0rners/CMakeLists.txt +++ b/src/filter/c0rners/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES c0rners.c interp.h) set (TARGET c0rners) if (MSVC) - set_source_files_properties (c0rners.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/c0rners/interp.h b/src/filter/c0rners/interp.h index 7db495b..3777ddc 100644 --- a/src/filter/c0rners/interp.h +++ b/src/filter/c0rners/interp.h @@ -107,11 +107,6 @@ void remap32(int wi, int hi, int wo, int ho, unsigned char *vhs, unsigned char * //************************************** //HERE BEGIN THE INTERPOLATION FUNCTIONS -#if defined(_MSC_VER) -__inline const float roundf(float x){ - return (int)floor(x+0.5); -} -#endif /* _MSC_VER */ //------------------------------------------------------ //za debugging - z izpisovanjem diff --git a/src/filter/cairogradient/CMakeLists.txt b/src/filter/cairogradient/CMakeLists.txt index 119ef17..77a4dfd 100644 --- a/src/filter/cairogradient/CMakeLists.txt +++ b/src/filter/cairogradient/CMakeLists.txt @@ -5,7 +5,6 @@ include_directories(${Cairo_INCLUDE_DIR}) set(LIBS ${LIBS} ${Cairo_LIBRARY}) if (MSVC) - set_source_files_properties (cairogradient.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/cairoimagegrid/CMakeLists.txt b/src/filter/cairoimagegrid/CMakeLists.txt index 6e6b729..52045ff 100644 --- a/src/filter/cairoimagegrid/CMakeLists.txt +++ b/src/filter/cairoimagegrid/CMakeLists.txt @@ -5,7 +5,6 @@ include_directories(${Cairo_INCLUDE_DIR}) set(LIBS ${LIBS} ${Cairo_LIBRARY}) if (MSVC) - set_source_files_properties (cairoimagegrid.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/cluster/CMakeLists.txt b/src/filter/cluster/CMakeLists.txt index e335568..8ff0bd1 100644 --- a/src/filter/cluster/CMakeLists.txt +++ b/src/filter/cluster/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES cluster.c) set (TARGET cluster) if (MSVC) - set_source_files_properties (cluster.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/colgate/CMakeLists.txt b/src/filter/colgate/CMakeLists.txt index b2575dc..76c6202 100644 --- a/src/filter/colgate/CMakeLists.txt +++ b/src/filter/colgate/CMakeLists.txt @@ -2,11 +2,12 @@ set (SOURCES colgate.c) set (TARGET colgate) if (MSVC) - set_source_files_properties (colgate.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) -link_libraries(m) +if(NOT MSVC) + link_libraries(m) +endif() add_library (${TARGET} MODULE ${SOURCES}) set_target_properties (${TARGET} PROPERTIES PREFIX "") diff --git a/src/filter/coloradj/CMakeLists.txt b/src/filter/coloradj/CMakeLists.txt index 0a2398c..d4d519e 100644 --- a/src/filter/coloradj/CMakeLists.txt +++ b/src/filter/coloradj/CMakeLists.txt @@ -2,11 +2,12 @@ set (SOURCES coloradj_RGB.c) set (TARGET coloradj_RGB) if (MSVC) - set_source_files_properties (coloradj_RGB.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) -link_libraries(m) +if(NOT MSVC) + link_libraries(m) +endif() add_library (${TARGET} MODULE ${SOURCES}) set_target_properties (${TARGET} PROPERTIES PREFIX "") diff --git a/src/filter/colordistance/CMakeLists.txt b/src/filter/colordistance/CMakeLists.txt index 6ab5bfc..f109eb4 100644 --- a/src/filter/colordistance/CMakeLists.txt +++ b/src/filter/colordistance/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES colordistance.c) set (TARGET colordistance) if (MSVC) - set_source_files_properties (colordistance.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/colordistance/colordistance.c b/src/filter/colordistance/colordistance.c index 4dbcbcb..6c68ff3 100644 --- a/src/filter/colordistance/colordistance.c +++ b/src/filter/colordistance/colordistance.c @@ -109,12 +109,6 @@ void f0r_get_param_value(f0r_instance_t instance, } -#if defined(_MSC_VER) -__inline const int rint(float x){ - return (int)(x+0.5); -} -#endif - void f0r_update(f0r_instance_t instance, double time, const uint32_t* inframe, uint32_t* outframe) { diff --git a/src/filter/colorhalftone/CMakeLists.txt b/src/filter/colorhalftone/CMakeLists.txt index 0d1d84f..599fdc6 100644 --- a/src/filter/colorhalftone/CMakeLists.txt +++ b/src/filter/colorhalftone/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES colorhalftone.c) set (TARGET colorhalftone) if (MSVC) - set_source_files_properties (colorhalftone.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/colorize/CMakeLists.txt b/src/filter/colorize/CMakeLists.txt index 11115e0..2333a6c 100644 --- a/src/filter/colorize/CMakeLists.txt +++ b/src/filter/colorize/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES colorize.c) set (TARGET colorize) if (MSVC) - set_source_files_properties (colorize.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/colortap/CMakeLists.txt b/src/filter/colortap/CMakeLists.txt index dad252c..02d42aa 100644 --- a/src/filter/colortap/CMakeLists.txt +++ b/src/filter/colortap/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES colortap.c) set (TARGET colortap) if (MSVC) - set_source_files_properties (colortap.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/contrast0r/CMakeLists.txt b/src/filter/contrast0r/CMakeLists.txt index 4df0d03..e4e3dc6 100644 --- a/src/filter/contrast0r/CMakeLists.txt +++ b/src/filter/contrast0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES contrast0r.c) set (TARGET contrast0r) if (MSVC) - set_source_files_properties (contrast0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/curves/CMakeLists.txt b/src/filter/curves/CMakeLists.txt index 6a71f7e..e4c98fd 100644 --- a/src/filter/curves/CMakeLists.txt +++ b/src/filter/curves/CMakeLists.txt @@ -1,3 +1,7 @@ +if(MSVC AND NOT CMAKE_CXX_COMPILER_ID MATCHES Clang) + return() # MSVC cl doesn't support Variable Length Arrays (VLA), but clang-cl does +endif() + # Set C99 flag for gcc if (CMAKE_COMPILER_IS_GNUCC) set(CMAKE_C_FLAGS "-std=c99") @@ -7,7 +11,6 @@ set (SOURCES curves.c) set (TARGET curves) if (MSVC) - set_source_files_properties (curves.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/d90stairsteppingfix/CMakeLists.txt b/src/filter/d90stairsteppingfix/CMakeLists.txt index 486640f..3bc51c2 100644 --- a/src/filter/d90stairsteppingfix/CMakeLists.txt +++ b/src/filter/d90stairsteppingfix/CMakeLists.txt @@ -1,3 +1,7 @@ +if(MSVC AND NOT CMAKE_CXX_COMPILER_ID MATCHES Clang) + return() # MSVC cl doesn't support Variable Length Arrays (VLA), but clang-cl does +endif() + set (SOURCES d90stairsteppingfix.cpp) set (TARGET d90stairsteppingfix) diff --git a/src/filter/defish0r/CMakeLists.txt b/src/filter/defish0r/CMakeLists.txt index 6d426b9..adbdde4 100644 --- a/src/filter/defish0r/CMakeLists.txt +++ b/src/filter/defish0r/CMakeLists.txt @@ -2,11 +2,12 @@ set (SOURCES defish0r.c interp.h) set (TARGET defish0r) if (MSVC) - set_source_files_properties (defish0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) -link_libraries(m) +if(NOT MSVC) + link_libraries(m) +endif() add_library (${TARGET} MODULE ${SOURCES}) set_target_properties (${TARGET} PROPERTIES PREFIX "") diff --git a/src/filter/defish0r/defish0r.c b/src/filter/defish0r/defish0r.c index 0c48b37..e3060f3 100644 --- a/src/filter/defish0r/defish0r.c +++ b/src/filter/defish0r/defish0r.c @@ -137,10 +137,6 @@ float defish(int n, float r, float f, float mr) return rr; } -#if defined(_MSC_VER) -#define hypotf _hypotf -#endif - //---------------------------------------------------------------- //nafila array map s polozaji pikslov //locena funkcija, da jo poklicem samo enkrat na zacetku, diff --git a/src/filter/denoise/CMakeLists.txt b/src/filter/denoise/CMakeLists.txt index 090dbab..48686fd 100644 --- a/src/filter/denoise/CMakeLists.txt +++ b/src/filter/denoise/CMakeLists.txt @@ -2,11 +2,12 @@ set (SOURCES hqdn3d.c) set (TARGET hqdn3d) if (MSVC) - set_source_files_properties (hqdn3d.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) -link_libraries(m) +if(NOT MSVC) + link_libraries(m) +endif() add_library (${TARGET} MODULE ${SOURCES}) set_target_properties (${TARGET} PROPERTIES PREFIX "") diff --git a/src/filter/distort0r/CMakeLists.txt b/src/filter/distort0r/CMakeLists.txt index 8210bd6..13d3f92 100644 --- a/src/filter/distort0r/CMakeLists.txt +++ b/src/filter/distort0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES distort0r.c) set (TARGET distort0r) if (MSVC) - set_source_files_properties (distort0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/dither/CMakeLists.txt b/src/filter/dither/CMakeLists.txt index 6cbb21b..85d347d 100644 --- a/src/filter/dither/CMakeLists.txt +++ b/src/filter/dither/CMakeLists.txt @@ -1,8 +1,11 @@ +if(MSVC AND NOT CMAKE_CXX_COMPILER_ID MATCHES Clang) + return() # MSVC cl doesn't support Variable Length Arrays (VLA), but clang-cl does +endif() + set (SOURCES dither.c) set (TARGET dither) if (MSVC) - set_source_files_properties (dither.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/emboss/CMakeLists.txt b/src/filter/emboss/CMakeLists.txt index 5b64b31..39d589e 100644 --- a/src/filter/emboss/CMakeLists.txt +++ b/src/filter/emboss/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES emboss.c) set (TARGET emboss) if (MSVC) - set_source_files_properties (emboss.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/flippo/CMakeLists.txt b/src/filter/flippo/CMakeLists.txt index e169ffa..645d98f 100644 --- a/src/filter/flippo/CMakeLists.txt +++ b/src/filter/flippo/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES flippo.c) set (TARGET flippo) if (MSVC) - set_source_files_properties (flippo.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/gamma/CMakeLists.txt b/src/filter/gamma/CMakeLists.txt index 9844625..829ba76 100644 --- a/src/filter/gamma/CMakeLists.txt +++ b/src/filter/gamma/CMakeLists.txt @@ -2,11 +2,12 @@ set (SOURCES gamma.c) set (TARGET gamma) if (MSVC) - set_source_files_properties (gamma.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) -link_libraries(m) +if(NOT MSVC) + link_libraries(m) +endif() add_library (${TARGET} MODULE ${SOURCES}) set_target_properties (${TARGET} PROPERTIES PREFIX "") diff --git a/src/filter/glitch0r/CMakeLists.txt b/src/filter/glitch0r/CMakeLists.txt index 55abe62..e14c025 100644 --- a/src/filter/glitch0r/CMakeLists.txt +++ b/src/filter/glitch0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES glitch0r.c) set (TARGET glitch0r) if (MSVC) - set_source_files_properties (glitch0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/glow/CMakeLists.txt b/src/filter/glow/CMakeLists.txt index a1c0350..23925b6 100644 --- a/src/filter/glow/CMakeLists.txt +++ b/src/filter/glow/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES glow.c) set (TARGET glow) if (MSVC) - set_source_files_properties (glow.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/host_param_test/CMakeLists.txt b/src/filter/host_param_test/CMakeLists.txt index 5e77cc0..ef22b65 100644 --- a/src/filter/host_param_test/CMakeLists.txt +++ b/src/filter/host_param_test/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES host_param_test.c) set (TARGET host_param_test) if (MSVC) - set_source_files_properties (host_param_test.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/hueshift0r/CMakeLists.txt b/src/filter/hueshift0r/CMakeLists.txt index 593dcb8..a6441be 100644 --- a/src/filter/hueshift0r/CMakeLists.txt +++ b/src/filter/hueshift0r/CMakeLists.txt @@ -2,11 +2,12 @@ set (SOURCES hueshift0r.c matrix.h) set (TARGET hueshift0r) if (MSVC) - set_source_files_properties (hueshift0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) -link_libraries(m) +if(NOT MSVC) + link_libraries(m) +endif() add_library (${TARGET} MODULE ${SOURCES}) set_target_properties (${TARGET} PROPERTIES PREFIX "") diff --git a/src/filter/invert0r/CMakeLists.txt b/src/filter/invert0r/CMakeLists.txt index e20e559..7b5c0e7 100644 --- a/src/filter/invert0r/CMakeLists.txt +++ b/src/filter/invert0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES invert0r.c) set (TARGET invert0r) if (MSVC) - set_source_files_properties (invert0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/keyspillm0pup/CMakeLists.txt b/src/filter/keyspillm0pup/CMakeLists.txt index 5e5bc80..90ec389 100644 --- a/src/filter/keyspillm0pup/CMakeLists.txt +++ b/src/filter/keyspillm0pup/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES keyspillm0pup.c) set (TARGET keyspillm0pup) if (MSVC) - set_source_files_properties (keyspillm0pup.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/lenscorrection/CMakeLists.txt b/src/filter/lenscorrection/CMakeLists.txt index 3ca9175..e5740bf 100644 --- a/src/filter/lenscorrection/CMakeLists.txt +++ b/src/filter/lenscorrection/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES lenscorrection.c) set (TARGET lenscorrection) if (MSVC) - set_source_files_properties (lenscorrection.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/letterb0xed/CMakeLists.txt b/src/filter/letterb0xed/CMakeLists.txt index 68df4cf..e4be355 100644 --- a/src/filter/letterb0xed/CMakeLists.txt +++ b/src/filter/letterb0xed/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES letterb0xed.c) set (TARGET letterb0xed) if (MSVC) - set_source_files_properties (letterb0xed.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/levels/CMakeLists.txt b/src/filter/levels/CMakeLists.txt index ef66de8..081fcd8 100644 --- a/src/filter/levels/CMakeLists.txt +++ b/src/filter/levels/CMakeLists.txt @@ -7,7 +7,6 @@ set (SOURCES levels.c) set (TARGET levels) if (MSVC) - set_source_files_properties (levels.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/lightgraffiti/lightgraffiti.cpp b/src/filter/lightgraffiti/lightgraffiti.cpp index 2a699a3..9f9ae77 100644 --- a/src/filter/lightgraffiti/lightgraffiti.cpp +++ b/src/filter/lightgraffiti/lightgraffiti.cpp @@ -64,9 +64,15 @@ [3] http://kdenlive.org/users/granjow/writing-light-graffiti-effect */ + +#if defined(_MSC_VER) +#define _USE_MATH_DEFINES +#endif /* _MSC_VER */ +#include + #include "frei0r.hpp" -#include + #include #include #include diff --git a/src/filter/luminance/CMakeLists.txt b/src/filter/luminance/CMakeLists.txt index db99d31..03cf633 100644 --- a/src/filter/luminance/CMakeLists.txt +++ b/src/filter/luminance/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES luminance.c) set (TARGET luminance) if (MSVC) - set_source_files_properties (luminance.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/mask0mate/CMakeLists.txt b/src/filter/mask0mate/CMakeLists.txt index a4ae9db..b316273 100644 --- a/src/filter/mask0mate/CMakeLists.txt +++ b/src/filter/mask0mate/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES mask0mate.c) set (TARGET mask0mate) if (MSVC) - set_source_files_properties (mask0mate.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/measure/CMakeLists.txt b/src/filter/measure/CMakeLists.txt index 7acbc9d..88999d1 100644 --- a/src/filter/measure/CMakeLists.txt +++ b/src/filter/measure/CMakeLists.txt @@ -2,7 +2,6 @@ set (B_SOURCES pr0be.c measure.h font2.h) set (F_SOURCES pr0file.c measure.h font2.h) if (MSVC) - set_source_files_properties (pr0be.c pr0file.c PROPERTIES LANGUAGE CXX) set (B_SOURCES ${B_SOURCES} ${FREI0R_DEF}) set (F_SOURCES ${F_SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/medians/CMakeLists.txt b/src/filter/medians/CMakeLists.txt index c953d43..8c6e786 100644 --- a/src/filter/medians/CMakeLists.txt +++ b/src/filter/medians/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES medians.c ctmf.h small_medians.h) set (TARGET medians) if (MSVC) - set_source_files_properties (medians.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/medians/ctmf.h b/src/filter/medians/ctmf.h index 2722e1b..f956aa6 100644 --- a/src/filter/medians/ctmf.h +++ b/src/filter/medians/ctmf.h @@ -36,17 +36,7 @@ #include #include #include - -/* Type declarations */ -#ifdef _MSC_VER -#include -typedef UINT8 uint8_t; -typedef UINT16 uint16_t; -typedef UINT32 uint32_t; -#pragma warning( disable: 4799 ) -#else #include -#endif /* Intrinsic declarations */ #if defined(__SSE2__) || defined(__MMX__) diff --git a/src/filter/normaliz0r/CMakeLists.txt b/src/filter/normaliz0r/CMakeLists.txt index 27eb50f..520860b 100644 --- a/src/filter/normaliz0r/CMakeLists.txt +++ b/src/filter/normaliz0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES normaliz0r.c) set (TARGET normaliz0r) if (MSVC) - set_source_files_properties (normaliz0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/perspective/CMakeLists.txt b/src/filter/perspective/CMakeLists.txt index 85df84a..f1da62b 100644 --- a/src/filter/perspective/CMakeLists.txt +++ b/src/filter/perspective/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES perspective.c) set (TARGET perspective) if (MSVC) - set_source_files_properties (perspective.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/perspective/perspective.c b/src/filter/perspective/perspective.c index d84c39a..cbd7e79 100644 --- a/src/filter/perspective/perspective.c +++ b/src/filter/perspective/perspective.c @@ -174,12 +174,6 @@ void f0r_get_param_value(f0r_instance_t instance, } } -#if defined(_MSC_VER) -__inline const long lrint(double x){ - return (long)(x+0.5); -} -#endif - void f0r_update(f0r_instance_t instance, double time, const uint32_t* inframe, uint32_t* outframe) { diff --git a/src/filter/pixeliz0r/CMakeLists.txt b/src/filter/pixeliz0r/CMakeLists.txt index c3a60c0..b437cd0 100644 --- a/src/filter/pixeliz0r/CMakeLists.txt +++ b/src/filter/pixeliz0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES pixeliz0r.c) set (TARGET pixeliz0r) if (MSVC) - set_source_files_properties (pixeliz0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/posterize/CMakeLists.txt b/src/filter/posterize/CMakeLists.txt index 0e6c1b0..cb59dc0 100644 --- a/src/filter/posterize/CMakeLists.txt +++ b/src/filter/posterize/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES posterize.c) set (TARGET posterize) if (MSVC) - set_source_files_properties (posterize.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/rgbnoise/CMakeLists.txt b/src/filter/rgbnoise/CMakeLists.txt index 15eebd2..f437caf 100644 --- a/src/filter/rgbnoise/CMakeLists.txt +++ b/src/filter/rgbnoise/CMakeLists.txt @@ -2,11 +2,12 @@ set (SOURCES rgbnoise.c) set (TARGET rgbnoise) if (MSVC) - set_source_files_properties (rgbnoise.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) -link_libraries(m) +if(NOT MSVC) + link_libraries(m) +endif() add_library (${TARGET} MODULE ${SOURCES}) set_target_properties (${TARGET} PROPERTIES PREFIX "") diff --git a/src/filter/rgbparade/CMakeLists.txt b/src/filter/rgbparade/CMakeLists.txt index 597995b..5a44153 100644 --- a/src/filter/rgbparade/CMakeLists.txt +++ b/src/filter/rgbparade/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES rgbparade.c rgbparade_image.h) set (TARGET rgbparade) if (MSVC) - set_source_files_properties (rgbparade.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/rgbsplit0r/CMakeLists.txt b/src/filter/rgbsplit0r/CMakeLists.txt index 9da2a69..516359c 100644 --- a/src/filter/rgbsplit0r/CMakeLists.txt +++ b/src/filter/rgbsplit0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES rgbsplit0r.c) set (TARGET rgbsplit0r) if (MSVC) - set_source_files_properties (rgbsplit0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/saturat0r/CMakeLists.txt b/src/filter/saturat0r/CMakeLists.txt index d03401d..3a9be1a 100644 --- a/src/filter/saturat0r/CMakeLists.txt +++ b/src/filter/saturat0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES saturat0r.c) set (TARGET saturat0r) if (MSVC) - set_source_files_properties (saturat0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/scale0tilt/CMakeLists.txt b/src/filter/scale0tilt/CMakeLists.txt index 71887dc..f2adafb 100644 --- a/src/filter/scale0tilt/CMakeLists.txt +++ b/src/filter/scale0tilt/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES scale0tilt.c) set (TARGET scale0tilt) if (MSVC) - set_source_files_properties (scale0tilt.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/select0r/CMakeLists.txt b/src/filter/select0r/CMakeLists.txt index f12e4ee..9ae3379 100644 --- a/src/filter/select0r/CMakeLists.txt +++ b/src/filter/select0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES select0r.c) set (TARGET select0r) if (MSVC) - set_source_files_properties (select0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/sharpness/CMakeLists.txt b/src/filter/sharpness/CMakeLists.txt index 3db05e4..027c846 100644 --- a/src/filter/sharpness/CMakeLists.txt +++ b/src/filter/sharpness/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES sharpness.c) set (TARGET sharpness) if (MSVC) - set_source_files_properties (sharpness.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/sigmoidaltransfer/CMakeLists.txt b/src/filter/sigmoidaltransfer/CMakeLists.txt index 185b984..592b8c0 100644 --- a/src/filter/sigmoidaltransfer/CMakeLists.txt +++ b/src/filter/sigmoidaltransfer/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES sigmoidaltransfer.c) set (TARGET sigmoidaltransfer) if (MSVC) - set_source_files_properties (sigmoidaltransfer.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/softglow/CMakeLists.txt b/src/filter/softglow/CMakeLists.txt index 759fcb8..dfc4fa4 100644 --- a/src/filter/softglow/CMakeLists.txt +++ b/src/filter/softglow/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES softglow.c) set (TARGET softglow) if (MSVC) - set_source_files_properties (softglow.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/spillsupress/CMakeLists.txt b/src/filter/spillsupress/CMakeLists.txt index 125c2f9..06d9a80 100644 --- a/src/filter/spillsupress/CMakeLists.txt +++ b/src/filter/spillsupress/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES spillsupress.c) set (TARGET spillsupress) if (MSVC) - set_source_files_properties (spillsupress.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/squareblur/CMakeLists.txt b/src/filter/squareblur/CMakeLists.txt index 30c33fd..1095118 100644 --- a/src/filter/squareblur/CMakeLists.txt +++ b/src/filter/squareblur/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES squareblur.c) set (TARGET squareblur) if (MSVC) - set_source_files_properties (squareblur.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/tehroxx0r/CMakeLists.txt b/src/filter/tehroxx0r/CMakeLists.txt index e5bb4d0..1d3fa55 100644 --- a/src/filter/tehroxx0r/CMakeLists.txt +++ b/src/filter/tehroxx0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES tehRoxx0r.c) set (TARGET tehRoxx0r) if (MSVC) - set_source_files_properties (tehRoxx0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/three_point_balance/CMakeLists.txt b/src/filter/three_point_balance/CMakeLists.txt index 7a3b35f..b3e09f3 100644 --- a/src/filter/three_point_balance/CMakeLists.txt +++ b/src/filter/three_point_balance/CMakeLists.txt @@ -7,7 +7,6 @@ set (SOURCES three_point_balance.c) set (TARGET three_point_balance) if (MSVC) - set_source_files_properties (three_point_balance.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/threshold0r/CMakeLists.txt b/src/filter/threshold0r/CMakeLists.txt index f5c480a..04beb52 100644 --- a/src/filter/threshold0r/CMakeLists.txt +++ b/src/filter/threshold0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES threshold0r.c) set (TARGET threshold0r) if (MSVC) - set_source_files_properties (threshold0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/tint0r/CMakeLists.txt b/src/filter/tint0r/CMakeLists.txt index 2ea47bf..835e8de 100644 --- a/src/filter/tint0r/CMakeLists.txt +++ b/src/filter/tint0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES tint0r.c) set (TARGET tint0r) if (MSVC) - set_source_files_properties (tint0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/transparency/CMakeLists.txt b/src/filter/transparency/CMakeLists.txt index b65ab76..f1f2890 100644 --- a/src/filter/transparency/CMakeLists.txt +++ b/src/filter/transparency/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES transparency.c) set (TARGET transparency) if (MSVC) - set_source_files_properties (transparency.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/vectorscope/CMakeLists.txt b/src/filter/vectorscope/CMakeLists.txt index 302566d..7d1b4f6 100644 --- a/src/filter/vectorscope/CMakeLists.txt +++ b/src/filter/vectorscope/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES vectorscope.c vectorscope_image.h) set (TARGET vectorscope) if (MSVC) - set_source_files_properties (vectorscope.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/vertigo/CMakeLists.txt b/src/filter/vertigo/CMakeLists.txt index bc29ac9..6d222f1 100644 --- a/src/filter/vertigo/CMakeLists.txt +++ b/src/filter/vertigo/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES vertigo.c) set (TARGET vertigo) if (MSVC) - set_source_files_properties (vertigo.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/filter/vignette/vignette.cpp b/src/filter/vignette/vignette.cpp index cf3685c..3aa7281 100644 --- a/src/filter/vignette/vignette.cpp +++ b/src/filter/vignette/vignette.cpp @@ -17,6 +17,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#if defined(_MSC_VER) +#define _USE_MATH_DEFINES +#endif /* _MSC_VER */ #include #include "frei0r.hpp" #include "frei0r_math.h" diff --git a/src/generator/ising0r/CMakeLists.txt b/src/generator/ising0r/CMakeLists.txt index 0432ec8..82be928 100644 --- a/src/generator/ising0r/CMakeLists.txt +++ b/src/generator/ising0r/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES ising0r.c) set (TARGET ising0r) if (MSVC) - set_source_files_properties (ising0r.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/generator/partik0l/partik0l.cpp b/src/generator/partik0l/partik0l.cpp index 40c3674..f7a1657 100644 --- a/src/generator/partik0l/partik0l.cpp +++ b/src/generator/partik0l/partik0l.cpp @@ -24,6 +24,10 @@ * */ +#if defined(_MSC_VER) +#define _USE_MATH_DEFINES +#endif /* _MSC_VER */ +#include #include "frei0r.hpp" @@ -31,10 +35,6 @@ #include #include -#if defined(_MSC_VER) -#define _USE_MATH_DEFINES -#endif /* _MSC_VER */ -#include #include #include diff --git a/src/generator/test_pat/CMakeLists.txt b/src/generator/test_pat/CMakeLists.txt index 5a8c34f..eed76bc 100644 --- a/src/generator/test_pat/CMakeLists.txt +++ b/src/generator/test_pat/CMakeLists.txt @@ -6,7 +6,6 @@ set (L_SOURCES test_pat_L.c) set (R_SOURCES test_pat_R.c) if (MSVC) - set_source_files_properties (test_pat_B.c test_pat_C.c test_pat_G.c test_pat_I.c test_pat_L.c test_pat_R.c PROPERTIES LANGUAGE CXX) set (B_SOURCES ${B_SOURCES} ${FREI0R_DEF}) set (C_SOURCES ${C_SOURCES} ${FREI0R_DEF}) set (G_SOURCES ${G_SOURCES} ${FREI0R_DEF}) @@ -15,7 +14,9 @@ if (MSVC) set (R_SOURCES ${R_SOURCES} ${FREI0R_DEF}) endif (MSVC) -link_libraries(m) +if(NOT MSVC) + link_libraries(m) +endif() add_library (test_pat_B MODULE ${B_SOURCES}) add_library (test_pat_C MODULE ${C_SOURCES}) add_library (test_pat_G MODULE ${G_SOURCES}) diff --git a/src/mixer2/alphainjection/CMakeLists.txt b/src/mixer2/alphainjection/CMakeLists.txt index c8349e2..87d687d 100644 --- a/src/mixer2/alphainjection/CMakeLists.txt +++ b/src/mixer2/alphainjection/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES alphainjection.c) set (TARGET alphainjection) if (MSVC) - set_source_files_properties (alphainjection.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_1_1_DEF}) endif (MSVC) diff --git a/src/mixer2/cairoaffineblend/CMakeLists.txt b/src/mixer2/cairoaffineblend/CMakeLists.txt index 1c3b13c..7ade4b9 100644 --- a/src/mixer2/cairoaffineblend/CMakeLists.txt +++ b/src/mixer2/cairoaffineblend/CMakeLists.txt @@ -5,7 +5,6 @@ include_directories(${Cairo_INCLUDE_DIR}) set(LIBS ${LIBS} ${Cairo_LIBRARY}) if (MSVC) - set_source_files_properties (cairoaffineblend.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/mixer2/cairoblend/CMakeLists.txt b/src/mixer2/cairoblend/CMakeLists.txt index 8209127..b0e2bb3 100644 --- a/src/mixer2/cairoblend/CMakeLists.txt +++ b/src/mixer2/cairoblend/CMakeLists.txt @@ -5,7 +5,6 @@ include_directories(${Cairo_INCLUDE_DIR}) set(LIBS ${LIBS} ${Cairo_LIBRARY}) if (MSVC) - set_source_files_properties (cairoblend.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_DEF}) endif (MSVC) diff --git a/src/mixer2/composition/CMakeLists.txt b/src/mixer2/composition/CMakeLists.txt index 26ec93f..8f518a1 100644 --- a/src/mixer2/composition/CMakeLists.txt +++ b/src/mixer2/composition/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES composition.c) set (TARGET composition) if (MSVC) - set_source_files_properties (composition.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_1_1_DEF}) endif (MSVC) diff --git a/src/mixer2/uvmap/CMakeLists.txt b/src/mixer2/uvmap/CMakeLists.txt index ad7afd0..60c6496 100644 --- a/src/mixer2/uvmap/CMakeLists.txt +++ b/src/mixer2/uvmap/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES uvmap.c) set (TARGET uvmap) if (MSVC) - set_source_files_properties (uvmap.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_1_1_DEF}) endif (MSVC) diff --git a/src/mixer2/uvmap/uvmap.c b/src/mixer2/uvmap/uvmap.c index 93c97db..731da02 100644 --- a/src/mixer2/uvmap/uvmap.c +++ b/src/mixer2/uvmap/uvmap.c @@ -75,12 +75,6 @@ void f0r_get_param_value(f0r_instance_t instance, f0r_param_t param, int param_index) { /* no params */ } -#if defined(_MSC_VER) -__inline const long int lrintf(float x){ - return (long int)(x+0.5); -} -#endif /* _MSC_VER */ - void f0r_update2(f0r_instance_t instance, double time, const uint32_t* inframe1, diff --git a/src/mixer3/RGB/CMakeLists.txt b/src/mixer3/RGB/CMakeLists.txt index cc0feda..c5bda36 100644 --- a/src/mixer3/RGB/CMakeLists.txt +++ b/src/mixer3/RGB/CMakeLists.txt @@ -2,7 +2,6 @@ set (SOURCES RGB.c) set (TARGET RGB) if (MSVC) - set_source_files_properties (RGB.c PROPERTIES LANGUAGE CXX) set (SOURCES ${SOURCES} ${FREI0R_1_1_DEF}) endif (MSVC)