From 74d30cf7ee93bf34563c0f575fa46efb4709226e Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Mon, 6 Aug 2012 16:33:31 -0500 Subject: [PATCH] Fixed cmake files to install headers and binary library file --- src/CMakeLists.txt | 14 ++++++++++++++ src/Main.cpp | 12 ++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9fc972fd..72744912 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -77,3 +77,17 @@ SET_SOURCE_FILES_PROPERTIES(openshot.i PROPERTIES CPLUSPLUS ON) SWIG_ADD_MODULE(openshot python openshot.i) SWIG_LINK_LIBRARIES(openshot ${PYTHON_LIBRARIES} openshot) +############### INSTALL HEADERS & LIBRARY ################ +INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include DESTINATION include/libopenshot FILES_MATCHING PATTERN "*.h") + +IF (UNIX) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenshot.so DESTINATION lib) +ELSE (UNIX) + IF (WIN32) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenshot.dll DESTINATION lib) + ELSE (WIN32) + IF (APPLE) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenshot.so DESTINATION lib) + ENDIF(APPLE) + ENDIF(WIN32) +ENDIF(UNIX) \ No newline at end of file diff --git a/src/Main.cpp b/src/Main.cpp index ad9dbdf1..02d5fb95 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -17,9 +17,9 @@ int main() // openshot::FFmpegReader r("../../src/examples/test.mp4"); // openshot::FFmpegReader r("../../src/examples/test1.mp4"); // openshot::FFmpegReader r("../../src/examples/piano.wav"); - openshot::FFmpegReader r("/home/jonathan/Videos/sintel-1024-stereo.mp4"); + // openshot::FFmpegReader r("/home/jonathan/Videos/sintel-1024-stereo.mp4"); // openshot::FFmpegReader r("/home/jonathan/Videos/00001.mts"); - // openshot::FFmpegReader r("/home/jonathan/Videos/sintel_trailer-720p.mp4"); + openshot::FFmpegReader r("/home/jonathan/Videos/sintel_trailer-720p.mp4"); // openshot::FFmpegReader r("/home/jonathan/Aptana Studio Workspace/OpenShotLibrary/src/examples/piano.wav"); // openshot::FFmpegReader r("/home/jonathan/Music/Army of Lovers/Crucified/Army of Lovers - Crucified [Single Version].mp3"); // openshot::FFmpegReader r("/home/jonathan/Documents/OpenShot Art/test.jpeg"); @@ -30,12 +30,12 @@ int main() r.DisplayInfo(); // Create a writer - FFmpegWriter w("/home/jonathan/output.webm"); + FFmpegWriter w("/home/jonathan/output.mp3"); w.DisplayInfo(); // Set options - w.SetVideoOptions(true, "libvpx", Fraction(24, 1), 720, 480, Fraction(1,1), false, false, 384000); - w.SetAudioOptions(true, "libvorbis", 44100, 2, 128000); + //w.SetVideoOptions(true, "libvpx", Fraction(24, 1), 720, 480, Fraction(1,1), false, false, 384000); + w.SetAudioOptions(true, "libmp3lame", 44100, 2, 128000); // Write header w.WriteHeader(); @@ -46,7 +46,7 @@ int main() // Set Options //w.SetOption(VIDEO_STREAM, "quality", "good"); - for (int frame = 300; frame <= 330; frame++) + for (int frame = 1; frame <= 500; frame++) { Frame f = r.GetFrame(frame);