mirror of
https://github.com/Michael-Prince-Sharpe/bsnes-classic.git
synced 2024-05-31 18:47:22 -04:00
Allow qtpath to be specified on OSX as well as on Windows
This commit is contained in:
parent
73a37f2afa
commit
fb26195547
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue