From 2610f274ebfc893b7db2c6ae79221dc26fe3789a Mon Sep 17 00:00:00 2001
From: Norayr Chilingarian <noch@Stewarts-MacBook-Pro.local>
Date: Thu, 20 Mar 2014 18:40:07 +0800
Subject: [PATCH] dylib and a archive generation under macosx

---
 makefile.darwin.clang.x86_64 |  18 ++++++++++--------
 ocat                         | Bin 151244 -> 151244 bytes
 showdef                      | Bin 327764 -> 327764 bytes
 voc                          | Bin 400844 -> 400844 bytes
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/makefile.darwin.clang.x86_64 b/makefile.darwin.clang.x86_64
index dc95daf6..6d15df01 100644
--- a/makefile.darwin.clang.x86_64
+++ b/makefile.darwin.clang.x86_64
@@ -33,7 +33,8 @@ CCOPT = -fPIC $(ADDITIONALFLAGS) $(INCLUDEPATH) -g
 
 CC = cc $(CCOPT) -c 
 CL = cc $(CCOPT) 
-LD = cc -shared -o $(LIBRARY).so
+#LD = cc -shared -o $(LIBRARY).so
+LD = cc -dynamiclib -o $(LIBRARY).dylib
 # s is necessary to create index inside a archive
 ARCHIVE = ar rcs $(LIBRARY).a
 
@@ -155,9 +156,10 @@ stage6:
 	$(VOCSTATIC) -sP oocFilenames.Mod
 	$(VOCSTATIC) -sP oocwrapperlibc.Mod
 	$(VOCSTATIC) -sP oocC.Mod
-	$(VOCSTATIC) -sP oocX11.Mod
-	$(VOCSTATIC) -sP oocXutil.Mod
-	$(VOCSTATIC) -sP oocXYplane.Mod
+	#no X11 under macosx
+	#$(VOCSTATIC) -sP oocX11.Mod
+	#$(VOCSTATIC) -sP oocXutil.Mod
+	#$(VOCSTATIC) -sP oocXYplane.Mod
 
 	#Ulm's Oberon system libs
 	$(VOCSTATIC) -sP ulmSys.Mod
@@ -258,20 +260,20 @@ stage6:
 stage7:
 	#objects := $(wildcard *.o)
 	#$(LD) objects
-	###$(ARCHIVE) *.o 
+	$(ARCHIVE) *.o 
 	#$(ARCHIVE) objects
-	###$(LD) *.o
+	$(LD) *.o
 ###	echo "$(PREFIX)/lib" > 05vishap.conf
 
 clean:
 #	rm_objects := rm $(wildcard *.o)
 #	objects
 	rm *.o
-	rm *.so
+	rm *.sym
 	rm *.h
 	rm *.c
 	rm *.a
-	rm *.sym
+	rm *.dylib
 
 install:
 	test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
diff --git a/ocat b/ocat
index 67b7f6fd355ca77862e4b839689c4e986b611020..99b7ba15871769d5b97ddb764eab5ca2556de81a 100755
GIT binary patch
delta 139
zcmX>zm-EbA&W0_F1&5d>9@<`Xh%t|mssGUSM~4~Laf29>&NJ#Uff$D_GQI;dHeF%#
z12dSeGv+aaq>64a_JKsEGu;I;CIB_vWwZkubLk#qA2UcK=@FwI4_N9QqaRr0(MQG%
RP1ckoQzPT;{?bgf#sJp)I~f1~

delta 139
zcmX>zm-EbA&W0_F1&5e+Fl;Y6#F)p(w2fi=qr;5rxIv6b=Na{wK#W5d8Q*~!o31eW
zff-EK8S|JyQbo5I`#>VoneGA^+ku+yGTMQSxpa@Q53D5V5u+XtSn3_4A2W#Y=p$o>
RCTp^Vfl11Ce`%&#V*s9hGdutQ

diff --git a/showdef b/showdef
index e68a3583e4ddc2aa8133f2930cd7a0d64a8bd1cf..dd6536b501768da54edab7b438e550e010ee89a2 100755
GIT binary patch
delta 198
zcmcc8AabQaq@jheg=q`(fe%a*4{bm6fjN$qssGS+rEkpZxIv6dj4XOgAO;f)%R4aR
z6B~;knBm09lE(~^+Qh@s2NId?#1CXl0BYiAv10_u2nn+EF@r=FiLmJLfTa{z{J<hg
zDlB~hAdyWbEOLTiDOZ+xV5uTcmOg%v2va1>J9ZG`Qv%C8u$oClEawc^Oe~EIlg+oM
JEoONa0|04UN~iz;

delta 198
zcmcc8AabQaq@jheg=q`(fe%dE8MYt#z#PZQw2fiA(l_RH+#tp!MixCL5QB+@<sF#u
ziH*e%%y8ml$zujdZQ^0+1Bpy`;s-K-#$4iOv10_u2nn+Eft4&0VbS9OODVAUF@qRN
zDlB~hAjT#W7CAw%lq<_TuvC#JOCLW-gej8c9Xp8eDS>4kSk0s&mU9MdsfmUbMrPa7
J7PGvI0RZTLKT-ey

diff --git a/voc b/voc
index 50baf8477bc789e1ecb1ca0b668bfd952c61ee80..03676c67f3722d492fd27011bafc570fc76e3270 100755
GIT binary patch
delta 226
zcmX@JTjI=aiG~)&7N!>FEi4jGm?j+BF7<?E9V1i!q3x%hvaI6<F{(bY=rMs9t3I>5
z12blQWAOtsUj1OnV+Kh@{bA_?iA;a>56A!-Q}v(44rI*MU95e~AOSBHRy`iDi~y@2
zSmcy2Yo7o}Bua%fj}gQ;rOGNN2x7c4W1R<9(`Cil#}5*b@?xC_mf97~`i>nWvMQOC
g4=lB-h_#LjBw|&|y26~zEY&R4!eIN0Ev!#60Ei@9<p2Nx

delta 226
zcmX@JTjI=aiG~)&7N!>FEi4jGn6@))mwLjoj*)2_!}e28S=Mob7*!ux^q4@5Ri9bj
zff=*DvG{=*uYR!PF@vO{{;>3cM5e#`2V?+^srt`i2Qp^sF4jJ<3NIE`Jsz-(0IMG}
zh;d4owNC)Vh*DwAV+4z+vdRg97_ZD&=YiF9S+Vx<gG8jfSm%MIc15$kV+V<>N@nE)
fOYJIRt>XfTSk<zwFlS3Pw@5WN-u_|>>yr!spr}uk