From 4f33ea9ba0ba5efed9f9ccd04663a86d64cbf808 Mon Sep 17 00:00:00 2001 From: Valentin NOEL Date: Fri, 17 Oct 2014 16:53:00 +0200 Subject: [PATCH 1/2] Windows: check MSVC version for building C++11 apps --- app/optionChecker/CMakeLists.txt | 2 +- app/presetChecker/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/optionChecker/CMakeLists.txt b/app/optionChecker/CMakeLists.txt index ca1d20a0..e3182458 100644 --- a/app/optionChecker/CMakeLists.txt +++ b/app/optionChecker/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR}) # Add C++11 flag if(NOT WIN32) set(CMAKE_CXX_FLAGS "-std=c++0x") -elseif(NOT MSVC12) +elseif(${MSVC_VERSION} LESS 1800) message("C++11 not supported, will not build avOptionChecker app.") return() endif() diff --git a/app/presetChecker/CMakeLists.txt b/app/presetChecker/CMakeLists.txt index d179f514..deb50df5 100644 --- a/app/presetChecker/CMakeLists.txt +++ b/app/presetChecker/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR}) # Add C++11 flag if(NOT WIN32) set(CMAKE_CXX_FLAGS "-std=c++0x") -elseif(NOT MSVC12) +elseif(${MSVC_VERSION} LESS 1800) message("C++11 not supported, will not build avPresetChecker app.") return() endif() From 180f3164c3d523c6bd401bf2afd1187239459efa Mon Sep 17 00:00:00 2001 From: Valentin NOEL Date: Fri, 17 Oct 2014 16:54:25 +0200 Subject: [PATCH 2/2] Windows: export CodecContext and Context classes for dll --- src/AvTranscoder/option/CodecContext.hpp | 2 +- src/AvTranscoder/option/Context.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AvTranscoder/option/CodecContext.hpp b/src/AvTranscoder/option/CodecContext.hpp index 0202ebde..81de85e5 100644 --- a/src/AvTranscoder/option/CodecContext.hpp +++ b/src/AvTranscoder/option/CodecContext.hpp @@ -12,7 +12,7 @@ namespace avtranscoder * @brief Wrapper of an AVCodecContext. * @note The AVCodecContext is allocated and free by the class. It is not the case of the base class. */ -class CodecContext : public Context +class AvExport CodecContext : public Context { public: CodecContext( int req_flags = 0 ); diff --git a/src/AvTranscoder/option/Context.hpp b/src/AvTranscoder/option/Context.hpp index 17bce389..b804943c 100644 --- a/src/AvTranscoder/option/Context.hpp +++ b/src/AvTranscoder/option/Context.hpp @@ -15,7 +15,7 @@ namespace avtranscoder * @brief Wrapper of AVContext. * Can access Options through the corresponding context. */ -class Context +class AvExport Context { public: Context() {} pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy