diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2011-01-02 23:27:23 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2011-01-02 23:27:23 +0100 |
| commit | 9352995934adec8059077af241c35ccd1573bd80 (patch) | |
| tree | 60286e266b3b31b90b952ac37e12a1ebbcdd2eb6 /nlove/patches | |
| parent | ef3b84d78197acbd45d73a9b1ae44b47b5904290 (diff) | |
| parent | 880bca260c4ce91554a49b2475232cf5c0ffd447 (diff) | |
| download | qipackages-fork-master.tar.gz | |
Conflicts:
links/Makefile
Diffstat (limited to 'nlove/patches')
| -rw-r--r-- | nlove/patches/001-c99.patch | 10 | ||||
| -rw-r--r-- | nlove/patches/001-cmake.patch | 24 | ||||
| -rw-r--r-- | nlove/patches/002-deviceconfig.patch | 20 | ||||
| -rw-r--r-- | nlove/patches/003-c99.patch | 10 |
4 files changed, 10 insertions, 54 deletions
diff --git a/nlove/patches/001-c99.patch b/nlove/patches/001-c99.patch new file mode 100644 index 0000000..9103164 --- /dev/null +++ b/nlove/patches/001-c99.patch @@ -0,0 +1,10 @@ +--- nlove/src/common/runtime.h 2010-08-10 13:31:20.000000000 +0200 ++++ nlovem/src/common/runtime.h 2010-08-10 13:42:15.000000000 +0200 +@@ -25,6 +25,7 @@ + #include "types.h" + + // Lua ++#define __STDC_VERSION__ 199901L + extern "C" { + #include <lua.h> + #include <lualib.h> diff --git a/nlove/patches/001-cmake.patch b/nlove/patches/001-cmake.patch deleted file mode 100644 index a0c4967..0000000 --- a/nlove/patches/001-cmake.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- sdltest-2.2.0/CMakeLists.txt 2010-08-04 11:50:25.000000000 +0200 -+++ sdltest-2.2.0m/CMakeLists.txt 2010-08-04 12:23:43.000000000 +0200 -@@ -1,13 +1,13 @@ - cmake_minimum_required (VERSION 2.8) - --set(PHYSFS_INCLUDE /usr/include/) --set(PHYSFS_LIBRARY physfs) --set(LUA_INCLUDE /usr/include/lua5.1) --set(LUA_LIBRARY lua5.1) --set(SDL_INCLUDE /usr/include/SDL) --set(SDL_LIBRARY SDL SDL_image SDL_gfx SDL_mixer) --set(FREETYPE_INCLUDE /usr/include/freetype2) --set(FREETYPE_LIBRARY freetype) -+set(PHYSFS_INCLUDE $ENV{STAGING_DIR}/usr/include/) -+set(PHYSFS_LIBRARY $ENV{STAGING_DIR}/usr/lib/libphysfs.so) -+set(LUA_INCLUDE $ENV{STAGING_DIR}/usr/include/lua) -+set(LUA_LIBRARY $ENV{STAGING_DIR}/usr/lib/liblua.so crypt) -+set(SDL_INCLUDE $ENV{STAGING_DIR}/usr/include/SDL) -+set(SDL_LIBRARY $ENV{STAGING_DIR}/usr/lib/libSDL.so $ENV{STAGING_DIR}/usr/lib/libSDL_image.so $ENV{STAGING_DIR}/usr/lib/libSDL_gfx.so $ENV{STAGING_DIR}/usr/lib/libSDL_mixer.so) -+set(FREETYPE_INCLUDE $ENV{STAGING_DIR}/usr/include/freetype2) -+set(FREETYPE_LIBRARY $ENV{STAGING_DIR}/usr/lib/libfreetype.so) - - include_directories(${PHYSFS_INCLUDE} ${LUA_INCLUDE} ${SDL_INCLUDE} $(FREETYPE_INCLUDE}) - include_directories(".") diff --git a/nlove/patches/002-deviceconfig.patch b/nlove/patches/002-deviceconfig.patch deleted file mode 100644 index 20c85bb..0000000 --- a/nlove/patches/002-deviceconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- sdltest-2.1.0/common/config.h 2010-08-04 11:41:07.000000000 +0200 -+++ sdltest-2.1.0m/common/config.h 2010-08-10 15:09:02.000000000 +0200 -@@ -35,6 +35,8 @@ - # define LOVE_MACOS 1 - #endif - -+#define LOVE_LINUX 1 -+ - // Endianness. - #if defined(__i386__) || defined(__i386) - # define LOVE_LITTLE_ENDIAN 1 -@@ -43,6 +45,8 @@ - # define LOVE_BIG_ENDIAN 1 - #endif - -+#define LOVE_LITTLE_ENDIAN 1 -+ - // Warnings. - #ifndef _CRT_SECURE_NO_WARNINGS - # define _CRT_SECURE_NO_WARNINGS diff --git a/nlove/patches/003-c99.patch b/nlove/patches/003-c99.patch deleted file mode 100644 index 9d0042a..0000000 --- a/nlove/patches/003-c99.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- sdltest-2.1.0/common/runtime.h 2010-08-10 13:31:20.000000000 +0200 -+++ sdltest-2.1.0m/common/runtime.h 2010-08-10 13:42:15.000000000 +0200 -@@ -25,6 +25,7 @@ - #include "types.h" - - // Lua -+#define __STDC_VERSION__ 199901L - extern "C" { - #include <lua.h> - #include <lualib.h> |