mirror of
https://github.com/hrydgard/ppsspp.git
synced 2024-11-23 13:30:02 +00:00
fix zlib compilation error
on ubuntu 13.04 if -lz isn't the last parameter occurs a compilation error
This commit is contained in:
parent
eef5fa3d94
commit
8c811009b0
@ -27,7 +27,7 @@ win32 {
|
||||
LIBS += -lCore -lCommon -lNative -lwinmm -lws2_32
|
||||
}
|
||||
linux {
|
||||
LIBS += -L. -lCore -lCommon -lNative -ldl -lz
|
||||
LIBS += -L. -lCore -lCommon -lNative -ldl
|
||||
PRE_TARGETDEPS += ./libCommon.a ./libCore.a ./libNative.a
|
||||
!mobile_platform {
|
||||
CONFIG += link_pkgconfig
|
||||
@ -38,6 +38,8 @@ linux {
|
||||
FFMPEG_DIR=../ffmpeg/linux/x86_64/lib/
|
||||
LIBS += $${FFMPEG_DIR}libavformat.a $${FFMPEG_DIR}libavcodec.a $${FFMPEG_DIR}libavutil.a $${FFMPEG_DIR}libswresample.a $${FFMPEG_DIR}libswscale.a
|
||||
}
|
||||
# put this at the end avoids problems with some compilers
|
||||
LIBS += -lz
|
||||
}
|
||||
|
||||
# Main
|
||||
|
Loading…
Reference in New Issue
Block a user