Skip to content

Fix build windows #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2014
Merged

Fix build windows #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f33ea9
Windows: check MSVC version for building C++11 apps
valnoel Oct 17, 2014
180f316
Windows: export CodecContext and Context classes for dll
valnoel Oct 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/optionChecker/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion app/presetChecker/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/AvTranscoder/option/CodecContext.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion src/AvTranscoder/option/Context.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace avtranscoder
* @brief Wrapper of AVContext.
* Can access Options through the corresponding context.
*/
class Context
class AvExport Context
{
public:
Context() {}
Expand Down