Skip to content

Commit

Permalink
qmake: set runpath, c++11
Browse files Browse the repository at this point in the history
  • Loading branch information
wang-bin committed Jul 6, 2015
1 parent 75bf461 commit aa40115
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
6 changes: 6 additions & 0 deletions .qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@ QTAV_PATCH_VERSION = 0

QTAV_VERSION = $${QTAV_MAJOR_VERSION}.$${QTAV_MINOR_VERSION}.$${QTAV_PATCH_VERSION}
#MODULE_VERSION = $$QTAV_VERSION

# set runpath instead of rpath for gcc for elf targets. Qt>=5.5
CONFIG *= enable_new_dtags
# OSX10.6 is not supported in Qt5.4
macx:isEqual(QT_MAJOR_VERSION,5):greaterThan(QT_MINOR_VERSION, 3): CONFIG *= c++11
android: CONFIG*=c++11
11 changes: 6 additions & 5 deletions QtAV.pro
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,16 @@ OptionalDepends = \
## sse2 sse4_1 may be defined in Qt5 qmodule.pri but is not included. Qt4 defines sse and sse2
!no-sse4_1:!sse4_1: OptionalDepends *= sse4_1
# no-xxx can set in $$PWD/user.conf
!no-dsound: win32: OptionalDepends *= dsound
!no-openal: OptionalDepends *= openal
!no-pulseaudio: OptionalDepends *= pulseaudio
!no-portaudio: OptionalDepends *= portaudio
!no-direct2d:!no-widgets: OptionalDepends *= direct2d
!no-gdiplus:!no-widgets: OptionalDepends *= gdiplus
# why win32 is false?
!no-dxva: OptionalDepends *= dxva
!no-libass: OptionalDepends *= libass
win32 {
!no-dsound: win32: OptionalDepends *= dsound
!no-direct2d:!no-widgets: OptionalDepends *= direct2d
!no-gdiplus:!no-widgets: OptionalDepends *= gdiplus
!no-dxva: OptionalDepends *= dxva
}
unix {
!no-xv:!no-widgets: OptionalDepends *= xv
!no-vaapi: OptionalDepends *= vaapi
Expand Down

0 comments on commit aa40115

Please sign in to comment.