mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 06:28:55 +02:00
WIP recipe for IUP
* Rebase the work I did against latest IUP release * Currently fails to build because IUP wants to generate both Lua 5.1 and 5.2 bindings. It seems we can't build_require both packages to build the bindings ? (require should be ok, as the libs for each version will go in different packages in the end). * Also, port some of the fixes to tecmake to the two other tecgraf libs using it.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 1274927462310ff54a257900076c5deed9559a13 Mon Sep 17 00:00:00 2001
|
||||
From 49ce8054eee01b9a146ff7a7ee77303b7834b2a5 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Fri, 15 Nov 2013 21:59:25 +0100
|
||||
Subject: Import Haiku port sources.
|
||||
@@ -688,7 +688,7 @@ index cc89349..fc982e0 100644
|
||||
}
|
||||
|
||||
diff --git a/tecmake.mak b/tecmake.mak
|
||||
index e5f5efd..169d45f 100644
|
||||
index e5f5efd..6463f3c 100644
|
||||
--- a/tecmake.mak
|
||||
+++ b/tecmake.mak
|
||||
@@ -6,7 +6,7 @@
|
||||
@@ -700,7 +700,17 @@ index e5f5efd..169d45f 100644
|
||||
|
||||
|
||||
#---------------------------------#
|
||||
@@ -505,6 +505,11 @@ else
|
||||
@@ -26,6 +26,9 @@ ifndef TEC_UNAME
|
||||
TEC_SYSARCH:=$(shell uname -m)
|
||||
|
||||
# Fixes
|
||||
+ ifeq ($(TEC_SYSNAME), Haiku)
|
||||
+ TEC_SYSARCH:=$(shell uname -p)
|
||||
+ endif
|
||||
ifeq ($(TEC_SYSNAME), SunOS)
|
||||
TEC_SYSARCH:=$(shell uname -p)
|
||||
endif
|
||||
@@ -505,6 +508,11 @@ else
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -712,7 +722,7 @@ index e5f5efd..169d45f 100644
|
||||
ifneq ($(findstring Linux, $(TEC_UNAME)), )
|
||||
UNIX_LINUX = Yes
|
||||
ifdef BUILD_64
|
||||
@@ -852,6 +857,7 @@ endif
|
||||
@@ -852,6 +860,7 @@ endif
|
||||
ifdef USE_IUP
|
||||
IUP_SUFFIX ?=
|
||||
ifdef USE_IUP3
|
||||
@@ -720,7 +730,7 @@ index e5f5efd..169d45f 100644
|
||||
ifdef GTK_DEFAULT
|
||||
ifdef USE_MOTIF
|
||||
IUP_SUFFIX := mot
|
||||
@@ -869,6 +875,7 @@ ifdef USE_IUP
|
||||
@@ -869,6 +878,7 @@ ifdef USE_IUP
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@@ -728,7 +738,7 @@ index e5f5efd..169d45f 100644
|
||||
else
|
||||
ifndef NO_OVERRIDE
|
||||
override USE_MOTIF = Yes
|
||||
@@ -902,17 +909,21 @@ endif
|
||||
@@ -902,17 +912,21 @@ endif
|
||||
|
||||
ifdef USE_CD
|
||||
CD_SUFFIX ?=
|
||||
@@ -761,7 +771,7 @@ index e5f5efd..169d45f 100644
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@@ -993,7 +1004,6 @@ endif
|
||||
@@ -993,7 +1007,6 @@ endif
|
||||
ifdef LINK_FREETYPE
|
||||
FREETYPE = freetype
|
||||
ifneq ($(findstring cygw, $(TEC_UNAME)), )
|
||||
@@ -769,7 +779,7 @@ index e5f5efd..169d45f 100644
|
||||
FREETYPE = freetype-6
|
||||
endif
|
||||
|
||||
@@ -1138,23 +1148,21 @@ ifdef USE_GTK
|
||||
@@ -1138,23 +1151,21 @@ ifdef USE_GTK
|
||||
ifndef USE_GTK3
|
||||
STDINCS += $(GTK)/lib/x86_64-linux-gnu/gtk-2.0/include
|
||||
endif
|
||||
@@ -808,7 +818,7 @@ index e5f5efd..169d45f 100644
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -1180,7 +1188,9 @@ ifdef USE_X11
|
||||
@@ -1180,7 +1191,9 @@ ifdef USE_X11
|
||||
STDINCS += $(X11_INC)
|
||||
endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user