mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 22:48:55 +02:00
MAME: packaging fix (#3910)
* MAME: resources, icon, startscript, user-settings
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
From fd6cdce8f103f772cded1dc8f9be7f55723e0cdd Mon Sep 17 00:00:00 2001
|
||||
From 10e90efe1df231765209973799a86338acc11d6d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Sun, 26 May 2019 16:32:28 +0200
|
||||
Date: Sun, 9 Jun 2019 18:07:46 +0200
|
||||
Subject: [PATCH] Haiku patches
|
||||
|
||||
---
|
||||
@@ -20,13 +20,12 @@ Subject: [PATCH] Haiku patches
|
||||
3rdparty/genie/src/base/cmdline.lua | 1 +
|
||||
3rdparty/genie/src/base/os.lua | 3 +
|
||||
3rdparty/genie/src/host/premake.h | 3 +
|
||||
3rdparty/lua-zlib/lua_zlib.c | 2 +-
|
||||
makefile | 27 +
|
||||
scripts/toolchain.lua | 9 +
|
||||
src/osd/modules/file/posixfile.cpp | 4 +-
|
||||
src/osd/modules/file/posixptty.cpp | 4 +
|
||||
src/osd/modules/render/drawbgfx.cpp | 2 +-
|
||||
22 files changed, 611 insertions(+), 7 deletions(-)
|
||||
21 files changed, 610 insertions(+), 6 deletions(-)
|
||||
create mode 100644 3rdparty/genie/build/gmake.haiku/Makefile
|
||||
create mode 100644 3rdparty/genie/build/gmake.haiku/genie.make
|
||||
|
||||
@@ -857,24 +856,11 @@ index f0782db4..5a3a636f 100644
|
||||
#else
|
||||
#define PLATFORM_WINDOWS (1)
|
||||
#define PLATFORM_STRING "windows"
|
||||
diff --git a/3rdparty/lua-zlib/lua_zlib.c b/3rdparty/lua-zlib/lua_zlib.c
|
||||
index 1921ab70..b619258c 100644
|
||||
--- a/3rdparty/lua-zlib/lua_zlib.c
|
||||
+++ b/3rdparty/lua-zlib/lua_zlib.c
|
||||
@@ -392,7 +392,7 @@ LUALIB_API int luaopen_zlib(lua_State * const L) {
|
||||
|
||||
SETLITERAL("_COPYRIGHT", "Copyright (c) 2009-2010 Brian Maher");
|
||||
SETLITERAL("_DESCRIPTION", "Yet another binding to the zlib library");
|
||||
- SETLITERAL("_VERSION", "lua-zlib $Id$ ");
|
||||
+ SETLITERAL("_VERSION", "lua-zlib $Id$ $Format:%d$");
|
||||
|
||||
/* Expose this to lua so we can do a test: */
|
||||
SETINT("_TEST_BUFSIZ", LUAL_BUFFERSIZE);
|
||||
diff --git a/makefile b/makefile
|
||||
index 40ac90c5..a71462e6 100644
|
||||
index 29935190..740b3d53 100644
|
||||
--- a/makefile
|
||||
+++ b/makefile
|
||||
@@ -214,6 +214,7 @@ GENIEOS := darwin
|
||||
@@ -215,6 +215,7 @@ GENIEOS := darwin
|
||||
endif
|
||||
ifeq ($(firstword $(filter Haiku,$(UNAME))),Haiku)
|
||||
OS := haiku
|
||||
@@ -882,7 +868,7 @@ index 40ac90c5..a71462e6 100644
|
||||
endif
|
||||
ifndef OS
|
||||
$(error Unable to detect OS from uname -a: $(UNAME))
|
||||
@@ -444,6 +445,10 @@ endif
|
||||
@@ -445,6 +446,10 @@ endif
|
||||
ifeq ($(TARGETOS),asmjs)
|
||||
OSD := sdl
|
||||
endif
|
||||
@@ -893,7 +879,7 @@ index 40ac90c5..a71462e6 100644
|
||||
endif
|
||||
|
||||
#-------------------------------------------------
|
||||
@@ -1547,6 +1552,28 @@ endif
|
||||
@@ -1552,6 +1557,28 @@ endif
|
||||
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-ci20 config=$(CONFIG) precompile
|
||||
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-ci20 config=$(CONFIG)
|
||||
|
||||
Reference in New Issue
Block a user