Skip to content
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.

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

Renames #2

Merged
merged 2 commits into from
Mar 23, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project(game.mupen64plus)
project(game.libretro.mupen64plus)

cmake_minimum_required(VERSION 2.6)

Expand Down Expand Up @@ -40,7 +40,7 @@ externalproject_add(mupen64plus
BUILD_IN_SOURCE 1)

set(MUPEN64PLUS_CUSTOM_BINARY ${PROJECT_BINARY_DIR}/mupen64plus/src/mupen64plus/mupen64plus_libretro${CMAKE_SHARED_LIBRARY_SUFFIX}
game.mupen64plus${CMAKE_SHARED_LIBRARY_SUFFIX} mupen64plus)
game.libretro.mupen64plus${CMAKE_SHARED_LIBRARY_SUFFIX} mupen64plus)

build_addon(game.mupen64plus MUPEN64PLUS DEPLIBS)
add_dependencies(game.mupen64plus mupen64plus)
build_addon(game.libretro.mupen64plus MUPEN64PLUS DEPLIBS)
add_dependencies(game.libretro.mupen64plus mupen64plus)
18 changes: 9 additions & 9 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,37 @@
Clone the repo and create a build directory

```shell
git clone https://github.com/kodi-game/game.mupen64plus.git
cd game.mupen64plus
git clone https://github.com/kodi-game/game.libretro.mupen64plus.git
cd game.libretro.mupen64plus
mkdir build
cd build
```

Generate a build environment with config for debugging

```shell
cmake -DADDONS_TO_BUILD=game.mupen64plus \
cmake -DADDONS_TO_BUILD=game.libretro.mupen64plus \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=$HOME/workspace/xbmc/addons \
$HOME/workspace/xbmc/project/cmake/addons
```

If you are developing in Eclipse, you can create a "makefile project with existing code" using `game.mupen64plus/` as the existing code location. To build, enter Properties -> "C/C++ Build" and change the build command to `make -C build`.
If you are developing in Eclipse, you can create a "makefile project with existing code" using `game.libretro.mupen64plus/` as the existing code location. To build, enter Properties -> "C/C++ Build" and change the build command to `make -C build`.

It is also possible to generate Eclipse project files with cmake

```shell
cmake -G"Eclipse CDT4 - Unix Makefiles" \
-D_ECLIPSE_VERSION=4.4 \
-DADDONS_TO_BUILD=game.mupen64plus \
-DADDONS_TO_BUILD=game.libretro.mupen64plus \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=$HOME/workspace/xbmc/addons \
$HOME/workspace/xbmc/project/cmake/addons
```

# Building in-tree (cross-compiling)

Kodi's build system will fetch the add-on from the GitHub URL and git hash specified in [game.mupen64plus.txt](https://github.com/garbear/xbmc/blob/retroplayer-15alpha2/project/cmake/addons/addons/game.mupen64plus/game.mupen64plus.txt).
Kodi's build system will fetch the add-on from the GitHub URL and git hash specified in [game.libretro.mupen64plus.txt](https://github.com/garbear/xbmc/blob/retroplayer-15alpha2/project/cmake/addons/addons/game.libretro.mupen64plus/game.libretro.mupen64plus.txt).

## Linux

Expand All @@ -48,13 +48,13 @@ make install DESTDIR=$HOME/kodi
Build the add-on

```shell
make -C tools/depends/target/binary-addons PREFIX=$HOME/kodi ADDONS="game.mupen64plus"
make -C tools/depends/target/binary-addons PREFIX=$HOME/kodi ADDONS="game.libretro.mupen64plus"
```

The compiled .so can be found at

```
$HOME/kodi/lib/kodi/addons/game.mupen64plus/game.mupen64plus.so
$HOME/kodi/lib/kodi/addons/game.libretro.mupen64plus/game.libretro.mupen64plus.so
```

To rebuild the add-on or compile a different one, clean the build directory
Expand Down Expand Up @@ -85,7 +85,7 @@ Per [README.osx](https://github.com/garbear/xbmc/blob/retroplayer-15alpha2/docs/

```shell
cd tools/depends
make -C target/binary-addons ADDONS="game.mupen64plus"
make -C target/binary-addons ADDONS="game.libretro.mupen64plus"
```

To rebuild the add-on or compile a different one, clean the build directory
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="game.mupen64plus"
<addon id="game.libretro.mupen64plus"
name="Nintendo 64 (Mupen64plus)"
version="2.0.2"
provider-name="Libretro">
<requires>
<import addon="game.libretro" version="1.0.0"/>
<import addon="game.controller.n64" version="1.0.0"/>
</requires>
<extension point="xbmc.gameclient"
library_android="game.mupen64plus.so"
library_linux="game.mupen64plus.so"
library_osx="game.mupen64plus.dylib"
library_windx="game.mupen64plus.dll"
library_wingl="game.mupen64plus.dll">
<extension point="kodi.gameclient"
library_android="game.libretro.mupen64plus.so"
library_linux="game.libretro.mupen64plus.so"
library_osx="game.libretro.mupen64plus.dylib"
library_windx="game.libretro.mupen64plus.dll"
library_wingl="game.libretro.mupen64plus.dll">
<platforms>Nintendo 64</platforms>
<extensions>n64|v64|z64</extensions>
<supports_vfs>true</supports_vfs>
Expand Down