revert the whole 'let's use ld' thing. It's useless, and might wreak

havoc on EMU builds picking up system libs instead of the bundled ones.
pull/2/merge
NiLuJe 12 years ago committed by Qingping Hou
parent 9169ac7541
commit b0f7ea5d81

@ -112,30 +112,22 @@ kpdfview: kpdfview.o einkfb.o pdf.o blitbuffer.o drawcontext.o input.o $(POPENNS
blitbuffer.o \ blitbuffer.o \
drawcontext.o \ drawcontext.o \
input.o \ input.o \
$(POPENNSLIB) \
util.o \ util.o \
ft.o \ ft.o \
lfs.o \ lfs.o \
mupdfimg.o \ mupdfimg.o \
$(MUPDFLIBS) \
$(THIRDPARTYLIBS) \
$(LUALIB) \
djvu.o \ djvu.o \
$(DJVULIBS) \
cre.o \ cre.o \
$(CRENGINELIBS) \
$(STATICLIBSTDCPP) \ $(STATICLIBSTDCPP) \
$(LDFLAGS) \ $(LDFLAGS) \
-L$(POPENNSDIR) \
-L$(MUPDFLIBDIR) \
-L$(DJVUDIR)/build/libdjvu/.libs \
-L$(LUADIR)/src \
-L$(CRENGINEDIR)/crengine \
-L$(CRENGINEDIR)/thirdparty/chmlib \
-L$(CRENGINEDIR)/thirdparty/libpng \
-L$(CRENGINEDIR)/thirdparty/antiword \
-L$(MUPDFLIBDIR) \
-o $@ \ -o $@ \
-lm -lpthread \ -lm -ldl -lpthread \
-lpopen_noshell \
-lfitz -lfreetype -lopenjpeg -ljbig2dec -ljpeg -lz \
-lluajit -ldl \
-ldjvulibre \
-lcrengine -lchmlib -lpng -lantiword \
$(EMU_LDFLAGS) \ $(EMU_LDFLAGS) \
$(DYNAMICLIBSTDCPP) $(DYNAMICLIBSTDCPP)

Loading…
Cancel
Save