Merge pull request jgilje#6 from zvezdochiot/master

0.20180608
Sound-Linux-More · Jun 9, 2018 · 22d3115 · 22d3115
2 parents 11749f1 + 22ca7ec
commit 22d3115
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -12,6 +12,7 @@ cd src
 ccmake .
 cmake .
 make
+sudo make install
 ```
 
 ## Usage

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
@@ -2,6 +2,10 @@
 Farbrausch V2M player
 SDL Port by github.com/jgilje
 
+0.20180608
+
+    INSTALL Version
+
 0.20180108
 
     Fix time play in V2MPlayer::Tick()

diff --git a/doc/VERSION b/doc/VERSION
@@ -1 +1 @@
-0.20180108
+0.20180608
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,32 +1,37 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8)
 
-PROJECT(v2mplayer)
+project(v2mplayer)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDEBUG -Os -flto -Wall -fno-asynchronous-unwind-tables -fno-stack-protector -ffunction-sections -fdata-sections -Wl,--gc-sections")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG -DRONAN -Os -flto -Wall -fno-asynchronous-unwind-tables -fno-stack-protector -ffunction-sections -fdata-sections -Wl,--gc-sections")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDEBUG -Os -flto -Wall -fno-asynchronous-unwind-tables -fno-stack-protector -ffunction-sections -fdata-sections -Wl,--gc-sections")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG -DRONAN -Os -flto -Wall -fno-asynchronous-unwind-tables -fno-stack-protector -ffunction-sections -fdata-sections -Wl,--gc-sections")
 
-SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake)
-SET(MAJOR_VERSION 0)
-SET(DATE_VERSION 20180108)
-SET(V2M_VERSION ${MAJOR_VERSION}.${DATE_VERSION})
-FIND_PACKAGE(SDL2 REQUIRED)
-INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIR})
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake)
+set(MAJOR_VERSION 0)
+set(DATE_VERSION 20180608)
+set(V2M_VERSION ${MAJOR_VERSION}.${DATE_VERSION})
+find_package(SDL2 REQUIRED)
+include_directories(${SDL2_INCLUDE_DIR})
 
-ADD_LIBRARY(v2m
+add_library(v2m
     SHARED
     ronan.cpp
     v2mplayer.cpp
     v2mconv.cpp
     synth_core.cpp
     sounddef.cpp
 )
-SET_TARGET_PROPERTIES(v2m PROPERTIES VERSION ${V2M_VERSION} SOVERSION ${MAJOR_VERSION})
+set_target_properties(v2m PROPERTIES VERSION ${V2M_VERSION} SOVERSION ${MAJOR_VERSION})
 
-ADD_EXECUTABLE(v2mplayer
+add_executable(v2mplayer
     tinyplayer.cpp
 )
-
-TARGET_LINK_LIBRARIES(v2mplayer
+target_link_libraries(v2mplayer
     ${SDL2_LIBRARY}
     v2m
 )
+
+install(TARGETS v2m DESTINATION lib)
+install(TARGETS v2mplayer DESTINATION bin)
+install(FILES ../man/man1/v2mplayer.1 DESTINATION share/man/man1)
+install(FILES libv2.h phonemtab.h sounddef.h synth.h types.h v2mconv.h v2mplayer.h DESTINATION include/v2m)
+install(FILES ../LICENSE ../README.md ../doc/AUTHORS ../doc/CHANGELOG ../doc/VERSION DESTINATION share/doc/v2mplayer)
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ cd src @@
     ccmake .
     cmake .
     make
+    sudo make install
     ```
     ## Usage
@@ Expand Down @@