diff options
| author | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
| commit | 3c1d4742e649fe9c8aed8c2817fe3e1f3364f298 (patch) | |
| tree | e0c6e02c89aa9227726c9469da1001b3e29c41df /avmedia/source/quicktime/makefile.mk | |
| parent | c5c31e2aeaedbdf76e1f38d3c385e34f5ed875ca (diff) | |
Resync to trunk, windows non-pro buildaoo/aw080
Diffstat (limited to 'avmedia/source/quicktime/makefile.mk')
| -rw-r--r-- | avmedia/source/quicktime/makefile.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk index 808360fac5fa..a45a8b3c22ff 100644 --- a/avmedia/source/quicktime/makefile.mk +++ b/avmedia/source/quicktime/makefile.mk @@ -26,7 +26,7 @@ PRJNAME=avmedia TARGET=avmediaQuickTime # the QuickTime API has been deprecated since OSX 10.5 and has been removed in the OSX SDK 10.7 -.IF ("$(GUIBASE)" != "aqua") || ("${MACOSX_DEPLOYMENT_TARGET:s/.//}" >= "106") +.IF "$(GUIBASE)" != "aqua" dummy: @echo " Nothing to build for GUIBASE=$(GUIBASE) and OSX$(MACOSX_DEPLOYMENT_TARGET)" .ELSE @@ -44,15 +44,15 @@ CDEFS+= -DVERBOSE CFLAGSCXX+=$(OBJCXXFLAGS) SLOFILES= \ - $(SLO)$/quicktimeuno.obj \ - $(SLO)$/framegrabber.obj \ - $(SLO)$/manager.obj \ - $(SLO)$/window.obj \ - $(SLO)$/player.obj + $(SLO)$/qt_uno.obj \ + $(SLO)$/qt_framegrabber.obj \ + $(SLO)$/qt_manager.obj \ + $(SLO)$/qt_window.obj \ + $(SLO)$/qt_player.obj EXCEPTIONSFILES= \ - $(SLO)$/framegrabber.obj \ - $(SLO)$/quicktimeuno.obj + $(SLO)$/qt_framegrabber.obj \ + $(SLO)$/qt_uno.obj SHL1TARGET= $(TARGET)$(DLLPOSTFIX) |