From 30ae085f56ceb8fd2e9af243b1e9fad1c3b9a8c2 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

Former-commit-id: 2610f274ebfc893b7db2c6ae79221dc26fe3789a
---
 makefile.darwin.clang.x86_64 |  18 ++++++++++--------
 ocat                         | Bin 151244 -> 151244 bytes
 showdef.REMOVED.git-id       |   2 +-
 voc.REMOVED.git-id           |   2 +-
 4 files changed, 12 insertions(+), 10 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.REMOVED.git-id b/showdef.REMOVED.git-id
index faaa9ceb..68e1e7cd 100644
--- a/showdef.REMOVED.git-id
+++ b/showdef.REMOVED.git-id
@@ -1 +1 @@
-e68a3583e4ddc2aa8133f2930cd7a0d64a8bd1cf
\ No newline at end of file
+dd6536b501768da54edab7b438e550e010ee89a2
\ No newline at end of file
diff --git a/voc.REMOVED.git-id b/voc.REMOVED.git-id
index a08bd302..d1dfa0bd 100644
--- a/voc.REMOVED.git-id
+++ b/voc.REMOVED.git-id
@@ -1 +1 @@
-50baf8477bc789e1ecb1ca0b668bfd952c61ee80
\ No newline at end of file
+03676c67f3722d492fd27011bafc570fc76e3270
\ No newline at end of file