Skip to content

Commit

Permalink
Unix|qmake: Adjusted linker options
Browse files Browse the repository at this point in the history
It seems dep_zlib.pri was missing options for regular
Unix builds. Also added -ldl to engine.pro.
  • Loading branch information
skyjake committed Jan 17, 2012
1 parent 21cb57c commit 3229dd3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
6 changes: 6 additions & 0 deletions doomsday/dep_zlib.pri
Expand Up @@ -9,5 +9,11 @@ win32 {
zlibs.path = $$DENG_LIB_DIR
}
else:macx {
# Mac OS X.
LIBS += -lz
}
else {
# Generic Unix.
QMAKE_CFLAGS += $$system(pkg-config zlib --cflags)
LIBS += $$system(pkg-config zlib --libs)
}
2 changes: 2 additions & 0 deletions doomsday/engine/engine.pro
Expand Up @@ -42,6 +42,8 @@ unix:!macx {
DEFINES += DENG_LIBRARY_DIR=\\\"$${DENG_LIB_DIR}/\\\"

QMAKE_LFLAGS += -rdynamic

LIBS += -ldl
}
macx {
useFramework(Cocoa)
Expand Down

0 comments on commit 3229dd3

Please sign in to comment.