Merge jv
authorHG Automerge
Wed, 01 Feb 2017 12:06:42 +0000
branchjv
changeset 1490 fa18770c50a9
parent 1486 f2eb1c4525e3 (current diff)
parent 1489 136d55757b10 (diff)
child 1499 7aa84447bdf1
Merge
--- a/.hgtags	Sat Jan 07 22:58:16 2017 +0000
+++ b/.hgtags	Wed Feb 01 12:06:42 2017 +0000
@@ -60,12 +60,13 @@
 a81feb46cc2af0b8b587afde7217800e8170c8b1 expecco_2_1_0
 aac5ba6489278c45ad953b10776614124e94a6f7 rel5_1_4
 b02e9366f9fccaf99a81c91e9714c86091d6e331 expecco_2_9_0
-b02e9366f9fccaf99a81c91e9714c86091d6e331 expecco_2_9_0_a
 b02e9366f9fccaf99a81c91e9714c86091d6e331 expecco_2_9_0_win75_lx36
 b02e9366f9fccaf99a81c91e9714c86091d6e331 expecco_2_9_1
 bac18ea4d1bc8d2e93be0d3b2aa6832b253a76a5 expecco_1_9_1_iX
 c1fccd660137feb71ac936657a5620e9b84399b5 rel5_2_2
 c5c3ae2d04750bcaa39cebc20fa6e1911095e628 patches
+cbdb205a8ee97ef3c95b2cbb17586a718f3deec7 expecco_2_10_0
+cbdb205a8ee97ef3c95b2cbb17586a718f3deec7 expecco_2_11_0
 ce28eba6e426930ff39d820743d0259eeee070fc rel3-1-2
 d2c0ad36f3ed659555b3883e548defbbfd169f8a expeccoNET_1_6_8_0
 d37a3939d86df5c76dd150e13ea4a175861aa0eb expeccoALM_1_9_0_1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/h_osx.rc	Wed Feb 01 12:06:42 2017 +0000
@@ -0,0 +1,28 @@
+"*
+ * Encoding: iso8859-1
+ *
+ * $Header$
+ *
+ * MIMEType: application/x-smalltalk-source
+ *
+ * ST/X startup configuration file - for OS-X.
+ *
+ * DONT add site specific things here - use your own h_xxx.rc file instead
+ * where xxx stands for your hostname(s)
+ *"
+
+"/
+"/ you should have XCode (at least the command line tools) installed
+"/
+
+Smalltalk wasStartedFromImage ifFalse:[
+    ParserFlags
+	ccCompilationOptions:
+	    '-O3 -mmacosx-version-min=10.6'
+	  , ' -I../../support/VGL/vogl/src'
+	  , ' -F/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks'
+	  , ' -framework Foundation'
+	  , ' -framework ApplicationServices'
+	  , ' -framework CoreFoundation'.
+].
+!
--- a/h_solaris.rc	Sat Jan 07 22:58:16 2017 +0000
+++ b/h_solaris.rc	Wed Feb 01 12:06:42 2017 +0000
@@ -17,6 +17,6 @@
 "/
 
 Smalltalk wasStartedFromImage ifFalse:[
-    Compiler ccCompilationOptions:'-O -fPIC'
+    ParserFlags ccCompilationOptions:'-O -fPIC'
 ].
 !