Allow qtpath to be specified on OSX as well as on Windows

This commit is contained in:
Alex W. Jackson 2015-07-21 20:58:08 -04:00
parent 73a37f2afa
commit fb26195547
3 changed files with 51 additions and 15 deletions

View file

@ -10,20 +10,32 @@
# $(qtlib) -- libraries for linking
ifeq ($(moc),)
moc := moc
ifeq ($(qtpath),)
moc := moc
else
moc := $(qtpath)/bin/moc
endif
endif
ifeq ($(rcc),)
rcc := rcc
ifeq ($(qtpath),)
rcc := rcc
else
rcc := $(qtpath)/bin/rcc
endif
endif
ifeq ($(platform),x)
qtinc := `pkg-config --cflags $(qtlibs)`
qtlib := `pkg-config --libs $(qtlibs)`
else ifeq ($(platform),osx)
qtinc := $(foreach lib,$(qtlibs),-I/Library/Frameworks/$(lib).framework/Versions/4/Headers)
qtlib := -L/Library/Frameworks
ifeq ($(qtpath),)
qtinc := $(foreach lib,$(qtlibs),-I/Library/Frameworks/$(lib).framework/Versions/4/Headers)
qtlib := -L/Library/Frameworks
else
qtinc := $(foreach lib,$(qtlibs),-I$(qtpath)/lib/$(lib).framework/Versions/4/Headers)
qtlib := -L$(qtpath)/lib -F$(qtpath)/lib
endif
qtlib += $(foreach lib,$(qtlibs),-framework $(lib))
qtlib += -framework Carbon
qtlib += -framework Cocoa

View file

@ -10,20 +10,32 @@
# $(qtlib) -- libraries for linking
ifeq ($(moc),)
moc := moc
ifeq ($(qtpath),)
moc := moc
else
moc := $(qtpath)/bin/moc
endif
endif
ifeq ($(rcc),)
rcc := rcc
ifeq ($(qtpath),)
rcc := rcc
else
rcc := $(qtpath)/bin/rcc
endif
endif
ifeq ($(platform),x)
qtinc := `pkg-config --cflags $(qtlibs)`
qtlib := `pkg-config --libs $(qtlibs)`
else ifeq ($(platform),osx)
qtinc := $(foreach lib,$(qtlibs),-I/Library/Frameworks/$(lib).framework/Versions/4/Headers)
qtlib := -L/Library/Frameworks
ifeq ($(qtpath),)
qtinc := $(foreach lib,$(qtlibs),-I/Library/Frameworks/$(lib).framework/Versions/4/Headers)
qtlib := -L/Library/Frameworks
else
qtinc := $(foreach lib,$(qtlibs),-I$(qtpath)/lib/$(lib).framework/Versions/4/Headers)
qtlib := -L$(qtpath)/lib -F$(qtpath)/lib
endif
qtlib += $(foreach lib,$(qtlibs),-framework $(lib))
qtlib += -framework Carbon
qtlib += -framework Cocoa

View file

@ -10,20 +10,32 @@
# $(qtlib) -- libraries for linking
ifeq ($(moc),)
moc := moc
ifeq ($(qtpath),)
moc := moc
else
moc := $(qtpath)/bin/moc
endif
endif
ifeq ($(rcc),)
rcc := rcc
ifeq ($(qtpath),)
rcc := rcc
else
rcc := $(qtpath)/bin/rcc
endif
endif
ifeq ($(platform),x)
qtinc := `pkg-config --cflags $(qtlibs)`
qtlib := `pkg-config --libs $(qtlibs)`
else ifeq ($(platform),osx)
qtinc := $(foreach lib,$(qtlibs),-I/Library/Frameworks/$(lib).framework/Versions/4/Headers)
qtlib := -L/Library/Frameworks
ifeq ($(qtpath),)
qtinc := $(foreach lib,$(qtlibs),-I/Library/Frameworks/$(lib).framework/Versions/4/Headers)
qtlib := -L/Library/Frameworks
else
qtinc := $(foreach lib,$(qtlibs),-I$(qtpath)/lib/$(lib).framework/Versions/4/Headers)
qtlib := -L$(qtpath)/lib -F$(qtpath)/lib
endif
qtlib += $(foreach lib,$(qtlibs),-framework $(lib))
qtlib += -framework Carbon
qtlib += -framework Cocoa