cd,iup: support hybrid builds

* Untested, as IM fails to build for a non-identified reason.

x11-libs/iup/patches/iup-3.8.patchset

@@ -1,9 +1,22 @@
-From 736ca6335b2068828da740c705994a6ca409d915 Mon Sep 17 00:00:00 2001
+From 115eb3270ff3039a7dcbeeb3510aa11c3a0c73d3 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Fri, 15 Nov 2013 22:50:38 +0100
-Subject: Import Haiku port work.
+Date: Sat, 16 Nov 2013 18:59:48 +0100
+Subject: Import work done on Haiku port.
 
 
+diff --git a/Makefile b/Makefile
+index dac895c..3cf0b70 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@ ifeq ($(OS), Windows_NT)
+ endif
+ 
+ .PHONY: do_all iup iupgtk iupmot iupcd iupcontrols iupgl iup_pplot iup_mglplot iup_scintilla iupim iupimglib ledc iupview iuplua3 iuplua5 iupconsole iupole iupweb iuptuio
+-do_all: iup iupcd iupcontrols iupgl iup_pplot iup_mglplot iup_scintilla iupim iupimglib $(WINLIBS) iupweb iuptuio ledc iupview iuplua5 iupconsole
++do_all: iup iupcd iupcontrols iupgl iup_pplot iup_mglplot iupim iupimglib $(WINLIBS) iupweb iuptuio ledc iupview iuplua5 iupconsole
+ 
+ iup iupgtk iupmot:
+ 	@$(MAKE) --no-print-directory -C ./src/ $@
 diff --git a/src/Makefile b/src/Makefile
 index b4ba247..0e099df 100644
 --- a/src/Makefile
@@ -7180,6 +7193,18 @@ index 619ded7..0b12e72 100644
    {
      data = IupGetAttribute(ih_canvas, "DRAWABLE");  /* new IUP 3 attribute, works for GTK only */
      if (!data)
+diff --git a/srcconsole/Makefile b/srcconsole/Makefile
+index a9102a3..c35adc9 100644
+--- a/srcconsole/Makefile
++++ b/srcconsole/Makefile
+@@ -8,7 +8,6 @@ endif
+ do_all: iuplua5
+  
+ iuplua5:
+-	@$(TECMAKE_CMD) USE_LUA51=Yes
+ 	@$(TECMAKE_CMD) USE_LUA52=Yes
+ 
+ iuplua5gtk:
 diff --git a/srcgl/config.mak b/srcgl/config.mak
 index d569f43..7de22a6 100644
 --- a/srcgl/config.mak
@@ -7841,6 +7866,19 @@ index 575e433..93747ce 100644
      motif = 1;
    else if (iupStrEqualNoCase(driver, "Win32"))
      win32 = 1;
+diff --git a/srclua5/Makefile b/srclua5/Makefile
+index 9c597fb..486cf17 100644
+--- a/srclua5/Makefile
++++ b/srclua5/Makefile
+@@ -6,7 +6,7 @@ else
+ endif
+ 
+ .PHONY: do_all iuplua iupluacd iupluacontrols iupluagl iuplua_pplot iuplua_mglplot iuplua_scintilla iupluaim iupluaimglib iupluatuio iupluaole iupluaweb
+-do_all: iuplua iupluacd iupluacontrols iupluagl iuplua_pplot iuplua_mglplot iuplua_scintilla iupluaim iupluaimglib iupluatuio $(WINLIBS)
++do_all: iuplua iupluacd iupluacontrols iupluagl iuplua_pplot iuplua_mglplot iupluaim iupluaimglib iupluatuio $(WINLIBS)
+ 
+ iuplua:
+ 	@$(TECMAKE_CMD) USE_LUA51=Yes 
 diff --git a/srcmglplot/mgl/mgl_ab.h b/srcmglplot/mgl/mgl_ab.h
 index 7c47201..35c1b1e 100644
 --- a/srcmglplot/mgl/mgl_ab.h
@@ -7877,6 +7915,17 @@ index d81c014..0685ce2 100644
  	static bool c = true;
  	TernAxis = t;
  	if(t)
+diff --git a/srcscintilla/Makefile b/srcscintilla/Makefile
+index 639ab7d..07f0d5f 100644
+--- a/srcscintilla/Makefile
++++ b/srcscintilla/Makefile
+@@ -7,5 +7,5 @@ endif
+ .PHONY: do_all iup_scintilla
+ do_all: iup_scintilla
+ 
+-iup_mglplot:
++iup_scintilla:
+ 	@$(TECMAKE_CMD) 
 diff --git a/srcview/config.mak b/srcview/config.mak
 index 742f92e..7e71767 100644
 --- a/srcview/config.mak
@@ -7919,7 +7968,7 @@ index cc89349..fc982e0 100644
  }
  
 diff --git a/tecmake.mak b/tecmake.mak
-index e5f5efd..76b1a0a 100644
+index e5f5efd..1e09d6c 100644
 --- a/tecmake.mak
 +++ b/tecmake.mak
 @@ -26,6 +26,9 @@ ifndef TEC_UNAME
@@ -7945,7 +7994,19 @@ index e5f5efd..76b1a0a 100644
  ifneq ($(findstring Linux, $(TEC_UNAME)), )
    UNIX_LINUX = Yes
    ifdef BUILD_64
-@@ -852,6 +861,7 @@ endif
+@@ -526,6 +535,11 @@ ifneq ($(findstring Linux, $(TEC_UNAME)), )
+   endif
+ endif
+ 
++ifneq ($(findstring Haiku, $(TEC_UNAME)), )
++  UNIX_POSIX = Yes
++  STDLDFLAGS := -shared -Wl,-soname=lib$(TARGETNAME).so
++endif
++
+ ifneq ($(findstring IRIX, $(TEC_UNAME)), )
+   UNIX_POSIX = Yes
+   ifndef NO_LOCAL_LD
+@@ -852,6 +866,7 @@ endif
  ifdef USE_IUP
    IUP_SUFFIX ?=
    ifdef USE_IUP3
@@ -7953,7 +8014,7 @@ index e5f5efd..76b1a0a 100644
      ifdef GTK_DEFAULT
        ifdef USE_MOTIF
          IUP_SUFFIX := mot
-@@ -869,6 +879,7 @@ ifdef USE_IUP
+@@ -869,6 +884,7 @@ ifdef USE_IUP
          endif
        endif
      endif
@@ -7961,7 +8022,7 @@ index e5f5efd..76b1a0a 100644
    else
      ifndef NO_OVERRIDE
        override USE_MOTIF = Yes
-@@ -956,6 +967,11 @@ ifdef USE_CD
+@@ -956,6 +972,11 @@ ifdef USE_CD
        LIBS += cdcairo
        LIBS += pangocairo-1.0 cairo
      endif
@@ -7973,7 +8034,7 @@ index e5f5efd..76b1a0a 100644
      
      LIBS += cd$(CD_SUFFIX)
      LDIR += $(CD_LIB)
-@@ -1180,7 +1196,9 @@ ifdef USE_X11
+@@ -1180,7 +1201,9 @@ ifdef USE_X11
    STDINCS += $(X11_INC)
  endif