From 3d3bc8e40e250387e456a672ce5e7a4915d021b4 Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Fri, 16 Dec 2016 21:51:53 +0100 Subject: [PATCH] - Game-Music-Emu: Merge commits b1948ac, 8af6ba4, eb5f592 and 56d43f4. Commit titles: b1948ac - 'Describe CMake addition for static libs in changelog.' 8af6ba4 - 'Bump version in CMakeLists as well.' eb5f592 - 'Update readme for repo move and next version.' 56d43f4 - 'Update readme as well now.' --- game-music-emu/CMakeLists.txt | 2 +- game-music-emu/changes.txt | 6 ++++++ game-music-emu/gme.txt | 13 +++++++------ game-music-emu/readme.txt | 30 +++++++++++++++++++++++------- 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/game-music-emu/CMakeLists.txt b/game-music-emu/CMakeLists.txt index 2e22994566..20973401bc 100644 --- a/game-music-emu/CMakeLists.txt +++ b/game-music-emu/CMakeLists.txt @@ -4,7 +4,7 @@ project(libgme) include (CheckCXXCompilerFlag) # When version is changed, also change the one in gme/gme.h to match -set(GME_VERSION 0.6.0 CACHE INTERNAL "libgme Version") +set(GME_VERSION 0.6.1 CACHE INTERNAL "libgme Version") # 2.6+ always assumes FATAL_ERROR, but 2.4 and below don't. # Of course, 2.4 might work, in which case you're welcome to drop diff --git a/game-music-emu/changes.txt b/game-music-emu/changes.txt index dfab7a9c03..48986756a2 100644 --- a/game-music-emu/changes.txt +++ b/game-music-emu/changes.txt @@ -4,8 +4,14 @@ Game_Music_Emu Change Log Game_Music_Emu 0.6.1 -------------------- +- Moved repository to Bitbucket since Google Code announced they would + shutdown this year. + - Packaging improvements: - Honor $LIB_SUFFIX for installed pkg-config metadata. + - Support setting BUILD_SHARED_LIBS to OFF to build libgme as a static + library. (Pass -DBUILD_SHARED_LIBS=OFF when running cmake). + Thanks to lachs0r. Game_Music_Emu 0.6.0 -------------------- diff --git a/game-music-emu/gme.txt b/game-music-emu/gme.txt index d9a2452c70..baec6f4dc0 100644 --- a/game-music-emu/gme.txt +++ b/game-music-emu/gme.txt @@ -1,10 +1,11 @@ -Game_Music_Emu 0.6.0 +Game_Music_Emu 0.6.1 -------------------- -Author : Shay Green -Website: http://www.slack.net/~ant/libs/ -Forum : http://groups.google.com/group/blargg-sound-libs -Source : https://code.google.com/p/game-music-emu/ -License: GNU Lesser General Public License (LGPL) +Author : Shay Green +Maintainer : Michael Pyne +Website : http://www.slack.net/~ant/libs/ +Forum : http://groups.google.com/group/blargg-sound-libs +Source : https://bitbucket.org/mpyne/game-music-emu/ +License : GNU Lesser General Public License (LGPL), see LICENSE.txt Contents -------- diff --git a/game-music-emu/readme.txt b/game-music-emu/readme.txt index 82a501dbda..b29a007971 100644 --- a/game-music-emu/readme.txt +++ b/game-music-emu/readme.txt @@ -1,4 +1,4 @@ -Game_Music_Emu 0.6.0: Game Music Emulators +Game_Music_Emu 0.6.1: Game Music Emulators ------------------------------------------ Game_Music_Emu is a collection of video game music file emulators that support the following formats and systems: @@ -38,26 +38,42 @@ Website: http://www.slack.net/~ant/ Forum : http://groups.google.com/group/blargg-sound-libs License: GNU Lesser General Public License (LGPL) +Current Maintainer: Michael Pyne Getting Started --------------- Build a program consisting of demo/basics.c, demo/Wave_Writer.cpp, and -all source files in gme/. If you have CMake 2.6 or later, execute +all source files in gme/. - run cmake - cd demo - run make +Or, if you have CMake 2.6 or later, execute at a command prompt (from the +extracted source directory): -Be sure "test.nsf" is in the same directory as the program. Running it + mkdir build + cd build + cmake ../ # <-- Pass any needed CMake flags here + make # To build the library + cd demo + make # To build the demo itself + +Be sure "test.nsf" is in the same directory as the demo program. Running it should generate the recording "out.wav". +You can use "make install" to install the library. To choose where to install +the library to, use the CMake argument "-DCMAKE_INSTALL_PREFIX=/usr/local" +(and replace /usr/local with the base path you wish to use). Alternately, you +can specify the base path to install to when you run "make install" by passing +'DESTDIR=/usr/local' on the make install command line (again, replace +/usr/local as appropriate). + +To build a static library instead of shared (the default), pass +-DBUILD_SHARED_LIBS=OFF to the cmake command when running cmake. + A slightly more extensive demo application is available in the player/ directory. It requires SDL to build. Read gme.txt for more information. Post to the discussion forum for assistance. - Files ----- gme.txt General notes about the library