Merge pull request #112 from valnoel/fix_build_windows

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit a28347e5247e · 2014-10-17T07:59:09.000-07:00
Fix build windows
diff --git 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
@@ -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()
diff --git 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
@@ -15,7 +15,7 @@ namespace avtranscoder
  * @brief Wrapper of AVContext.
  * Can access Options through the corresponding context.
  */
-class Context
+class AvExport Context
 {
 public:
 	Context() {}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace avtranscoder`
`12`	`12`	`* @brief Wrapper of an AVCodecContext.`
`13`	`13`	`* @note The AVCodecContext is allocated and free by the class. It is not the case of the base class.`
`14`	`14`	`*/`
`15`		`-class CodecContext : public Context`
	`15`	`+class AvExport CodecContext : public Context`
`16`	`16`	`{`
`17`	`17`	`public:`
`18`	`18`	`CodecContext( int req_flags = 0 );`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace avtranscoder`
`15`	`15`	`* @brief Wrapper of AVContext.`
`16`	`16`	`* Can access Options through the corresponding context.`
`17`	`17`	`*/`
`18`		`-class Context`
	`18`	`+class AvExport Context`
`19`	`19`	`{`
`20`	`20`	`public:`
`21`	`21`	`Context() {}`