From 4bfce3b6e2ea095ea3d9f5d2d1018cc0a1e5ce09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20K=C3=BChling?= Date: Sat, 18 Sep 2010 20:47:21 +0200 Subject: Major overhaul and cleanup. Support for .ubi image file installations. Only compile&install a minimum host Gforth for bootstrapping the target Gforth, removing strange emacs-dependencies that cropped up earlier. Image file can now be built on the nanonote using 'gforth-update-image' command. Also, Gforth is now run through a wrapper that calls 'gforth-update-image' automatically, if necessary. Also first attempts at supporting libcc C-interface libraries pre-compiled on the host. Tested to compile on amd64 and i386. --- nlove/patches/001-cmake.patch | 24 ++++++++++++++++++++++++ nlove/patches/002-deviceconfig.patch | 20 ++++++++++++++++++++ nlove/patches/003-c99.patch | 10 ++++++++++ 3 files changed, 54 insertions(+) create mode 100644 nlove/patches/001-cmake.patch create mode 100644 nlove/patches/002-deviceconfig.patch create mode 100644 nlove/patches/003-c99.patch (limited to 'nlove/patches') diff --git a/nlove/patches/001-cmake.patch b/nlove/patches/001-cmake.patch new file mode 100644 index 0000000..a0c4967 --- /dev/null +++ b/nlove/patches/001-cmake.patch @@ -0,0 +1,24 @@ +--- 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 new file mode 100644 index 0000000..20c85bb --- /dev/null +++ b/nlove/patches/002-deviceconfig.patch @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 0000000..9d0042a --- /dev/null +++ b/nlove/patches/003-c99.patch @@ -0,0 +1,10 @@ +--- 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 + #include -- cgit v1.2.3