Merge branch 'master' of git://factorcode.org/git/factor

db4
Doug Coleman 2008-10-03 02:22:16 -05:00
commit 2aec863519
7 changed files with 2 additions and 5 deletions

3
Makefile Executable file → Normal file
View File

@ -149,9 +149,6 @@ macosx.app: factor
ln -s Factor.app/Contents/MacOS/factor ./factor ln -s Factor.app/Contents/MacOS/factor ./factor
cp $(ENGINE) $(BUNDLE)/Contents/Frameworks cp $(ENGINE) $(BUNDLE)/Contents/Frameworks
install_name_tool \
-id @executable_path/../Frameworks/libfreetype.6.dylib \
Factor.app/Contents/Frameworks/libfreetype.6.dylib
install_name_tool \ install_name_tool \
-change libfactor.dylib \ -change libfactor.dylib \
@executable_path/../Frameworks/libfactor.dylib \ @executable_path/../Frameworks/libfactor.dylib \

View File

@ -105,7 +105,7 @@ M: threaded-server handle-client* handler>> call ;
threaded-server get encoding>> <server> threaded-server get encoding>> <server>
[ started-accept-loop ] [ [ accept-loop ] with-disposal ] bi ; [ started-accept-loop ] [ [ accept-loop ] with-disposal ] bi ;
\ start-accept-loop ERROR add-error-logging \ start-accept-loop NOTICE add-error-logging
: init-server ( threaded-server -- threaded-server ) : init-server ( threaded-server -- threaded-server )
dup semaphore>> [ dup semaphore>> [