Compile fix for 64-bit distros which put 64-bit libraries in lib64
parent
07676d61cd
commit
97f22b07ea
5
Makefile
5
Makefile
|
|
@ -6,6 +6,7 @@ BUNDLE = Factor.app
|
|||
VERSION = 0.86
|
||||
DISK_IMAGE_DIR = Factor-$(VERSION)
|
||||
DISK_IMAGE = Factor-$(VERSION).dmg
|
||||
LIBPATH = -L/usr/X11R6/lib
|
||||
|
||||
ifdef DEBUG
|
||||
CFLAGS = -g
|
||||
|
|
@ -75,7 +76,7 @@ macosx-x86: macosx-freetype
|
|||
$(MAKE) $(BINARY) CONFIG=vm/Config.macosx
|
||||
|
||||
linux-x86 linux-amd64:
|
||||
$(MAKE) $(BINARY) CONFIG=vm/Config.linux
|
||||
$(MAKE) $(BINARY) CONFIG=vm/Config.linux.amd64
|
||||
$(STRIP) $(BINARY)
|
||||
|
||||
linux-ppc:
|
||||
|
|
@ -124,7 +125,7 @@ macosx.dmg:
|
|||
-volname "$(DISK_IMAGE_DIR)" "$(DISK_IMAGE)"
|
||||
|
||||
f: $(OBJS)
|
||||
$(CC) $(LIBS) $(CFLAGS) -o $@$(PLAF_SUFFIX) $(OBJS)
|
||||
$(CC) $(LIBS) $(LIBPATH) $(CFLAGS) -o $@$(PLAF_SUFFIX) $(OBJS)
|
||||
|
||||
clean:
|
||||
rm -f vm/*.o
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
- grid slows down with 2000 lines
|
||||
- growable data heap
|
||||
- more compact relocation info
|
||||
- update module system docs
|
||||
- cocoa: close item disabled
|
||||
|
||||
+ ui:
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
include vm/Config.linux
|
||||
LIBPATH = -L/usr/X11R6/lib64 $(LIBPATH)
|
||||
|
|
@ -3,5 +3,5 @@ PLAF_OBJS = vm/os-unix.o
|
|||
ifdef NO_UI
|
||||
X11_UI_LIBS =
|
||||
else
|
||||
X11_UI_LIBS = -lfreetype -lGL -lGLU -L/usr/X11R6/lib -lX11
|
||||
X11_UI_LIBS = -lfreetype -lGL -lGLU -lX11
|
||||
endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue