1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
Index: amoeba-1.1/Makefile
===================================================================
--- amoeba-1.1.orig/Makefile
+++ amoeba-1.1/Makefile
@@ -23,7 +23,7 @@ ifeq ($(PLATFORM),linux)
EXTRALIBS=
#EXTRALIBS=-lefence
#EXTRALIBS=/usr/src/dmalloc-4.6.0/libdmallocth.a /usr/src/dmalloc-4.6.0/dmallocc.o
- CPPFLAGS += $(shell freetype-config --cflags) $(shell pkg-config --cflags gtk+-2.0)
+ CPPFLAGS += $(shell pkg-config --cflags freetype2) $(shell pkg-config --cflags gtk+-2.0)
ifeq ($(LINUXVARIANT),gcc)
CC=gcc
CXX=g++
@@ -72,7 +72,7 @@ clean:
ifeq ($(DESTPLATFORM),linux)
$(EXE): $(SUBLIBS) exception.o test-demolib.o
# $(CXX) $(LDFLAGS) -o test-demolib test-demolib.o exception.o $(SUBLIBS) -lm -lGL -lGLU /usr/lib/libexpat.a /usr/local/lib/tinylib/libpng.a /usr/local/lib/tinylib/libz.a -L/usr/X11R6/lib/ -lXxf86vm -lX11 -lXext /usr/local/lib/tinylib/libjpeg.a /usr/local/lib/tinylib/libfreetype.a /usr/local/lib/tinylib/libvorbisfile.a /usr/local/lib/tinylib/libvorbis.a /usr/local/lib/tinylib/libogg.a $(EXTRALIBS)
- $(CXX) $(LDFLAGS) -o $(EXE) test-demolib.o exception.o $(SUBLIBS) -lm -lGL -lGLU -lexpat -lpng -lz -L/usr/X11R6/lib/ -lXxf86vm -lX11 -ljpeg `freetype-config --libs` -lvorbisfile -lasound -ldl $(EXTRALIBS)
+ $(CXX) $(LDFLAGS) -o $(EXE) test-demolib.o exception.o $(SUBLIBS) -lm -lGL -lGLU -lexpat -lpng -lz -L/usr/X11R6/lib/ -lXxf86vm -lX11 -ljpeg `pkg-config --libs freetype2` -lvorbisfile -lasound -ldl $(EXTRALIBS)
else
%.o: %.rc
$(WINDRES) $< $@
|
