Merge branch 'master' of git://factorcode.org/git/factor
commit
2aec863519
|
@ -149,14 +149,11 @@ macosx.app: factor
|
|||
ln -s Factor.app/Contents/MacOS/factor ./factor
|
||||
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 \
|
||||
-change libfactor.dylib \
|
||||
@executable_path/../Frameworks/libfactor.dylib \
|
||||
Factor.app/Contents/MacOS/factor
|
||||
|
||||
|
||||
factor: $(DLL_OBJS) $(EXE_OBJS)
|
||||
$(LINKER) $(ENGINE) $(DLL_OBJS)
|
||||
$(CC) $(LIBS) $(LIBPATH) -L. $(LINK_WITH_ENGINE) \
|
||||
|
|
|
@ -105,7 +105,7 @@ M: threaded-server handle-client* handler>> call ;
|
|||
threaded-server get encoding>> <server>
|
||||
[ 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 )
|
||||
dup semaphore>> [
|
||||
|
|
Loading…
Reference in New Issue