steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compile fix for 64-bit distros which put 64-bit libraries in lib64

slava 2006-10-21 20:01:02 +00:00
parent 07676d61cd
commit 97f22b07ea
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -6,6 +6,7 @@ BUNDLE = Factor.app
VERSION = 0.86 VERSION = 0.86
DISK_IMAGE_DIR = Factor-$(VERSION) DISK_IMAGE_DIR = Factor-$(VERSION)
DISK_IMAGE = Factor-$(VERSION).dmg DISK_IMAGE = Factor-$(VERSION).dmg
LIBPATH = -L/usr/X11R6/lib
ifdef DEBUG ifdef DEBUG
CFLAGS = -g CFLAGS = -g
@ -75,7 +76,7 @@ macosx-x86: macosx-freetype
$(MAKE) $(BINARY) CONFIG=vm/Config.macosx $(MAKE) $(BINARY) CONFIG=vm/Config.macosx
linux-x86 linux-amd64: linux-x86 linux-amd64:
$(MAKE) $(BINARY) CONFIG=vm/Config.linux $(MAKE) $(BINARY) CONFIG=vm/Config.linux.amd64
$(STRIP) $(BINARY) $(STRIP) $(BINARY)
linux-ppc: linux-ppc:
@ -124,7 +125,7 @@ macosx.dmg:
-volname "$(DISK_IMAGE_DIR)" "$(DISK_IMAGE)" -volname "$(DISK_IMAGE_DIR)" "$(DISK_IMAGE)"
f: $(OBJS) f: $(OBJS)
$(CC) $(LIBS) $(CFLAGS) -o $@$(PLAF_SUFFIX) $(OBJS) $(CC) $(LIBS) $(LIBPATH) $(CFLAGS) -o $@$(PLAF_SUFFIX) $(OBJS)
clean: clean:
rm -f vm/*.o rm -f vm/*.o

2
TODO.FACTOR.txt
View File

@ -14,6 +14,8 @@
- grid slows down with 2000 lines - grid slows down with 2000 lines
- growable data heap - growable data heap
- more compact relocation info - more compact relocation info
- update module system docs
- cocoa: close item disabled
+ ui: + ui:

2
vm/Config.linux.amd64 Normal file
View File

@ -0,0 +1,2 @@
include vm/Config.linux
LIBPATH = -L/usr/X11R6/lib64 $(LIBPATH)

2
vm/Config.unix
View File

@ -3,5 +3,5 @@ PLAF_OBJS = vm/os-unix.o
ifdef NO_UI ifdef NO_UI
X11_UI_LIBS = X11_UI_LIBS =
else else
X11_UI_LIBS = -lfreetype -lGL -lGLU -L/usr/X11R6/lib -lX11 X11_UI_LIBS = -lfreetype -lGL -lGLU -lX11
endif endif