io.streams.256color: faster by caching styles

[factor.git] / vm / Config.macosx

diff --git a/vm/Config.macosx b/vm/Config.macosx
index a135999430139b03eaf44df53269ee1cb965ca32..67cd585827eff54dc6941df0931fb0549b3a9c0f 100644 (file)
--- a/vm/Config.macosx
+++ b/vm/Config.macosx
@@ -1,6 +1,4 @@
 include vm/Config.unix
-#SITE_CFLAGS +=
-SITE_CFLAGS += -mmacosx-version-min=10.5
 
 PLAF_DLL_OBJS += vm/os-macosx.o vm/mach_signal.o vm/mvm-unix.o
 PLAF_MASTER_HEADERS += vm/os-macosx.hpp vm/mach_signal.hpp
@@ -11,16 +9,16 @@ SHARED_DLL_EXTENSION = .dylib
 SHARED_FLAG = -dynamiclib
 
 ifdef X11
-       LIBS = -lm -framework Cocoa -L/opt/local/lib $(X11_UI_LIBS) -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+       LIBS = -lm -framework Cocoa -L/opt/local/lib -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
 else
        LIBS = -lm -framework Cocoa -framework AppKit
 endif
 
-LINKER = $(CPP) $(CFLAGS) -dynamiclib -single_module \
+LINKER = $(CXX) $(TARGET) $(CFLAGS) $(CXXFLAGS) $(SHARED_FLAG) -single_module \
        -current_version $(VERSION) \
        -compatibility_version $(VERSION) \
        -fvisibility=hidden \
-       $(LIBS) $(LIBPATH) -o
+       $(LIBS) -o
 
 LINK_WITH_ENGINE = -lfactor
 
@@ -28,12 +26,11 @@ LEOPARD_P := $(shell [[ `uname -r | sed -E -e 's/^([0-9]+).*/\1/'` -le 9 ]]; ech
 XCODE_4_P := $(shell [[ `xcodebuild -version | sed -E -ne 's/^Xcode ([0-9]+).([0-9]).*/\1\2/p'` -ge 43 ]]; echo $$?)
 
 ifeq ($(LEOPARD_P),0)
-       CC = gcc-4.2
-       CPP = g++-4.2
+       CC ?= gcc-4.2
+       CXX ?= g++-4.2
 endif
 
 ifeq ($(XCODE_4_P),0)
-       CC = clang
-       CPP = clang++
+       CC ?= clang
+       CXX ?= clang++
 endif
-