Skip to content

Commit 5f11431

Browse files
MarcAntoine-ArnaudMarcAntoine-Arnaud
committed
Merge pull request #110 from valnoel/fix_build_windows
Fix build windows
2 parents 59e7340 + 9960f54 commit 5f11431

31 files changed

+245
-202
lines changed

‎CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ set(CMAKE_VERBOSE_MAKEFILE OFF)
2020
if(NOT WIN32)
2121
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -fPIC -pg -g")
2222
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC -O3")
23+
else()
24+
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
25+
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
2326
endif()
2427

2528

‎app/avInfo/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,18 @@ set_target_properties(avinfo PROPERTIES VERSION ${AVTRANSCODER_VERSION})
1111
target_link_libraries(avinfo avtranscoder-shared)
1212

1313
# Install app
14+
if(WIN32)
15+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avinfo.exe")
16+
else()
17+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avinfo" "${CMAKE_CURRENT_BINARY_DIR}/avinfo-${AVTRANSCODER_VERSION}")
18+
endif()
19+
1420
install(
15-
FILES "${CMAKE_CURRENT_BINARY_DIR}/avinfo" "${CMAKE_CURRENT_BINARY_DIR}/avinfo-${AVTRANSCODER_VERSION}"
21+
FILES ${BINARY_FILES}
1622
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
1723
DESTINATION "bin/"
1824
)
25+
1926
install(
2027
FILES ${CMAKE_CURRENT_SOURCE_DIR}/avinfo.man
2128
RENAME "avinfo.1"

‎app/avMeta/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,18 @@ set_target_properties(avmeta PROPERTIES VERSION ${AVTRANSCODER_VERSION})
1111
target_link_libraries(avmeta avtranscoder-shared)
1212

1313
# Install app
14+
if(WIN32)
15+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avmeta.exe")
16+
else()
17+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avmeta" "${CMAKE_CURRENT_BINARY_DIR}/avmeta-${AVTRANSCODER_VERSION}")
18+
endif()
19+
1420
install(
15-
FILES "${CMAKE_CURRENT_BINARY_DIR}/avmeta" "${CMAKE_CURRENT_BINARY_DIR}/avmeta-${AVTRANSCODER_VERSION}"
21+
FILES ${BINARY_FILES}
1622
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
1723
DESTINATION "bin/"
1824
)
25+
1926
install(
2027
FILES ${CMAKE_CURRENT_SOURCE_DIR}/avmeta.man
2128
RENAME "avmeta.1"

‎app/avTranscoder/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,18 @@ set_target_properties(avtranscoder PROPERTIES VERSION ${AVTRANSCODER_VERSION})
1111
target_link_libraries(avtranscoder avtranscoder-shared)
1212

1313
# Install app
14+
if(WIN32)
15+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder.exe")
16+
else()
17+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder" "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder-${AVTRANSCODER_VERSION}")
18+
endif()
19+
1420
install(
15-
FILES "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder" "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder-${AVTRANSCODER_VERSION}"
21+
FILES ${BINARY_FILES}
1622
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
1723
DESTINATION "bin/"
1824
)
25+
1926
install(
2027
FILES ${CMAKE_CURRENT_SOURCE_DIR}/av++.man
2128
RENAME av++.1

‎app/avplay/CMakeLists.txt

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,38 @@ endif()
1313

1414
# Check GLUT
1515
find_package(GLUT)
16-
if(NOT GLUT_FOUND)
16+
17+
if(NOT GLUT_Xi_LIBRARY OR NOT GLUT_Xmu_LIBRARY)
18+
set(GLUT_FOUND FALSE)
19+
endif()
20+
21+
if(NOT GLUT_FOUND)
1722
message("GLUT not found, will not build avplay app.")
1823
return()
1924
endif()
2025

2126
# Build app
2227
include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
23-
include_directories( ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} )
28+
include_directories( ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIR} )
2429

2530
file(GLOB AVPLAY_SRC_FILES "*.cpp" "*.hpp")
2631
add_executable(avplay ${AVPLAY_SRC_FILES})
2732
set_target_properties(avplay PROPERTIES VERSION ${AVTRANSCODER_VERSION})
28-
target_link_libraries(avplay avtranscoder-shared ${OPENGL_LIBRARIES} ${GLUT_LIBRARY})
33+
target_link_libraries(avplay avtranscoder-shared ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
2934

3035
# Install app
36+
if(WIN32)
37+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avplay.exe")
38+
else()
39+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avplay" "${CMAKE_CURRENT_BINARY_DIR}/avplay-${AVTRANSCODER_VERSION}")
40+
endif()
41+
3142
install(
32-
FILES "${CMAKE_CURRENT_BINARY_DIR}/avplay" "${CMAKE_CURRENT_BINARY_DIR}/avplay-${AVTRANSCODER_VERSION}"
43+
FILES ${BINARY_FILES}
3344
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
3445
DESTINATION "bin/"
3546
)
47+
3648
install(
3749
FILES ${CMAKE_CURRENT_SOURCE_DIR}/avplayer.man
3850
RENAME avplayer.1

‎app/genericProcessor/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,18 @@ set_target_properties(avprocessor PROPERTIES VERSION ${AVTRANSCODER_VERSION})
1111
target_link_libraries(avprocessor avtranscoder-shared)
1212

1313
# Install app
14+
if(WIN32)
15+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avprocessor.exe")
16+
else()
17+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avprocessor" "${CMAKE_CURRENT_BINARY_DIR}/avprocessor-${AVTRANSCODER_VERSION}")
18+
endif()
19+
1420
install(
15-
FILES "${CMAKE_CURRENT_BINARY_DIR}/avprocessor" "${CMAKE_CURRENT_BINARY_DIR}/avprocessor-${AVTRANSCODER_VERSION}"
21+
FILES ${BINARY_FILES}
1622
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
1723
DESTINATION "bin/"
1824
)
25+
1926
install(
2027
FILES ${CMAKE_CURRENT_SOURCE_DIR}/avprocessor.man
2128
RENAME avprocessor.1

‎app/optionChecker/CMakeLists.txt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,26 @@ include(AvTranscoderMacros)
77
# Build app
88
include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
99
# Add C++11 flag
10-
set(CMAKE_CXX_FLAGS "-std=c++0x")
10+
if(NOT WIN32)
11+
set(CMAKE_CXX_FLAGS "-std=c++0x")
12+
elseif(NOT MSVC12)
13+
message("C++11 not supported, will not build avOptionChecker app.")
14+
return()
15+
endif()
16+
1117
add_executable(avoptionchecker optionChecker.cpp)
1218
set_target_properties(avoptionchecker PROPERTIES VERSION ${AVTRANSCODER_VERSION})
1319
target_link_libraries(avoptionchecker avtranscoder-shared)
1420

1521
# Install app
22+
if(WIN32)
23+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker.exe")
24+
else()
25+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker" "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker-${AVTRANSCODER_VERSION}")
26+
endif()
27+
1628
install(
17-
FILES "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker" "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker-${AVTRANSCODER_VERSION}"
29+
FILES ${BINARY_FILES}
1830
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
1931
DESTINATION "bin/"
2032
)

‎app/presetChecker/CMakeLists.txt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,30 @@ include(AvTranscoderMacros)
77
# Build app
88
include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
99
# Add C++11 flag
10-
set(CMAKE_CXX_FLAGS "-std=c++0x")
10+
if(NOT WIN32)
11+
set(CMAKE_CXX_FLAGS "-std=c++0x")
12+
elseif(NOT MSVC12)
13+
message("C++11 not supported, will not build avPresetChecker app.")
14+
return()
15+
endif()
16+
1117
add_executable(avpresetchecker presetChecker.cpp)
1218
set_target_properties(avpresetchecker PROPERTIES VERSION ${AVTRANSCODER_VERSION})
1319
target_link_libraries(avpresetchecker avtranscoder-shared)
1420

1521
# Install app
22+
if(WIN32)
23+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker.exe")
24+
else()
25+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker" "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker-${AVTRANSCODER_VERSION}")
26+
endif()
27+
1628
install(
17-
FILES "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker" "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker-${AVTRANSCODER_VERSION}"
29+
FILES ${BINARY_FILES}
1830
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
1931
DESTINATION "bin/"
2032
)
33+
2134
install(
2235
FILES ${CMAKE_CURRENT_SOURCE_DIR}/avprofiles.man
2336
RENAME avprofiles.1

‎app/presetChecker/presetChecker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ int main( int argc, char** argv )
2525
std::cout << std::setw(35) << key.first << key.second << std::endl;
2626

2727
try{
28-
if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeVideo )
28+
if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeVideo )
2929
{
3030
avtranscoder::AvOutputVideo outputVideo;
3131
outputVideo.setProfile( profile, outputVideo.getVideoCodec().getVideoFrameDesc() );
3232
}
3333

34-
if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeAudio )
34+
if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeAudio )
3535
{
3636
avtranscoder::AvOutputAudio outputAudio;
3737
outputAudio.setProfile( profile, outputAudio.getAudioCodec().getFrameDesc() );

‎src/AvTranscoder/Library.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace avtranscoder
1010
{
1111

12-
class Library
12+
class AvExport Library
1313
{
1414
public:
1515
Library( const std::string& name, const std::string& license, const size_t major, const size_t minor, const size_t release );
@@ -33,11 +33,11 @@ class Library
3333

3434
typedef std::vector< Library > Libraries;
3535

36-
Libraries getLibraries();
36+
Libraries AvExport getLibraries();
3737

38-
std::vector<std::string> getInputExtensions();
38+
std::vector<std::string> AvExport getInputExtensions();
3939

40-
std::vector<std::string> getOutputExtensions();
40+
std::vector<std::string> AvExport getOutputExtensions();
4141

4242
}
4343

0 commit comments

Comments
 (0)