Fixed Premake 4.4

This commit is contained in:
Adrián Arroyo Calle
2015-01-08 18:40:55 +00:00
parent 719495ab98
commit 2b722b18a5
3 changed files with 44 additions and 58 deletions

View File

@@ -1,54 +0,0 @@
From 24fb42f5d8c5e23290a9e22d577174a6151f4a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
<adrian.arroyocalle@gmail.com>
Date: Wed, 7 Jan 2015 16:17:46 +0000
Subject: Fixing Premake4
diff --git a/build/gmake.unix/Premake4.make b/build/gmake.unix/Premake4.make
index bbc159b..7cb8ce5 100644
--- a/build/gmake.unix/Premake4.make
+++ b/build/gmake.unix/Premake4.make
@@ -28,8 +28,8 @@ ifeq ($(config),release)
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -Os
CXXFLAGS += $(CFLAGS)
- LDFLAGS += -s -rdynamic
- LIBS += -lm -ldl
+ LDFLAGS += -s
+ LIBS += -lbe -lroot -ltracker
RESFLAGS += $(DEFINES) $(INCLUDES)
LDDEPS +=
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
diff --git a/src/host/lua-5.1.4/src/luaconf.h b/src/host/lua-5.1.4/src/luaconf.h
index e2cb261..b702731 100644
--- a/src/host/lua-5.1.4/src/luaconf.h
+++ b/src/host/lua-5.1.4/src/luaconf.h
@@ -55,8 +55,10 @@
#define LUA_USE_MKSTEMP
#define LUA_USE_ISATTY
#define LUA_USE_POPEN
+#ifndef __HAIKU__
#define LUA_USE_ULONGJMP
#endif
+#endif
/*
diff --git a/src/host/premake.h b/src/host/premake.h
index 4358b18..72371e1 100644
--- a/src/host/premake.h
+++ b/src/host/premake.h
@@ -24,6 +24,9 @@
#elif defined(__sun__) && defined(__svr4__)
#define PLATFORM_SOLARIS (1)
#define PLATFORM_STRING "solaris"
+#elif defined(__HAIKU__)
+#define PLATFORM_LINUX (1)
+#define PLATFORM_STRING "haiku"
#else
#define PLATFORM_WINDOWS (1)
#define PLATFORM_STRING "windows"
--
1.8.3.4

View File

@@ -0,0 +1,39 @@
From 0621b3e542f32146cea8177b128665e0aa7d44b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
<adrian.arroyocalle@gmail.com>
Date: Thu, 8 Jan 2015 18:10:54 +0000
Subject: Finxing Haiku build
diff --git a/build/gmake.unix/Premake4.make b/build/gmake.unix/Premake4.make
index 5b8e979..314879c 100644
--- a/build/gmake.unix/Premake4.make
+++ b/build/gmake.unix/Premake4.make
@@ -29,9 +29,9 @@ ifeq ($(config),release)
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS)
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
- ALL_LDFLAGS += $(LDFLAGS) -L. -s -rdynamic
+ ALL_LDFLAGS += $(LDFLAGS) -L. -s
LDDEPS +=
- LIBS += $(LDDEPS) -lm -ldl
+ LIBS += $(LDDEPS)
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
define PREBUILDCMDS
endef
diff --git a/src/host/lua-5.1.4/src/luaconf.h b/src/host/lua-5.1.4/src/luaconf.h
index e2cb261..e2c6418 100644
--- a/src/host/lua-5.1.4/src/luaconf.h
+++ b/src/host/lua-5.1.4/src/luaconf.h
@@ -55,7 +55,7 @@
#define LUA_USE_MKSTEMP
#define LUA_USE_ISATTY
#define LUA_USE_POPEN
-#define LUA_USE_ULONGJMP
+/* #define LUA_USE_ULONGJMP */
#endif
--
1.8.3.4

View File

@@ -5,8 +5,8 @@ let Premake write the build scripts for you. With one file your project can \
support both IDE-addicted Windows coders and Linux command-line junkies!
"
HOMEPAGE="http://industriousone.com/premake"
SRC_URI="http://sourceforge.net/projects/premake/files/Premake/4.3/premake-4.3-src.zip/download"
CHECKSUM_SHA256="36536490f8928d8ecde135da80cd8b751ea5bebe50cabba5c0de49cd41cb2780"
SRC_URI="http://sourceforge.net/projects/premake/files/Premake/4.4/premake-4.4-beta5-src.zip"
CHECKSUM_SHA256="0fa1ed02c5229d931e87995123cdb11d44fcc8bd99bba8e8bb1bbc0aaa798161"
REVISION="1"
LICENSE="BSD (2-clause)"
COPYRIGHT="2012 Industrious One, LLC"
@@ -20,6 +20,7 @@ fi
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
premake
premake4$secondaryArchSuffix = $portVersion
cmd:premake4$secondaryArchSuffix = $portVersion
"
@@ -38,9 +39,9 @@ BUILD_PREREQUIRES="
cmd:make
"
SOURCE_DIR="premake-4.3"
SOURCE_DIR="premake-4.4-beta5"
PATCHES="premake-4.3.patchset"
PATCHES="premake-4.4-beta5.patchset"
BUILD()
{