5cfb80a28e
Conflicts: src/angle/src/libGLESv2/libGLESv2.pro src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp Change-Id: If8da4cfe8f57fea9f78e7239f378a6302c01674e
24 lines
532 B
Plaintext
24 lines
532 B
Plaintext
#macx-g++ (different from g++.conf)
|
|
|
|
#
|
|
# qmake configuration for macx-g++
|
|
#
|
|
# OS X + command-line compiler
|
|
#
|
|
|
|
MAKEFILE_GENERATOR = UNIX
|
|
CONFIG += app_bundle incremental global_init_link_order lib_version_first
|
|
QMAKE_INCREMENTAL_STYLE = sublib
|
|
|
|
include(../common/macx.conf)
|
|
include(../common/gcc-base-mac.conf)
|
|
include(../common/g++-macx.conf)
|
|
|
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
|
|
|
|
QMAKE_CFLAGS += -arch i386
|
|
QMAKE_CXXFLAGS += -arch i386
|
|
QMAKE_LFLAGS += -arch i386
|
|
|
|
load(qt_config)
|