Manual merge

This commit is contained in:
mfeemster
2016-01-12 20:51:13 -08:00
6 changed files with 335 additions and 53 deletions

View File

@ -18,6 +18,7 @@ LIBS += -L$$absolute_path($$DESTDIR) -lEmber
QMAKE_CXXFLAGS += -D_USRDLL
QMAKE_CXXFLAGS += -D_CONSOLE
QMAKE_CXXFLAGS += -BUILDING_EMBERCL
win32: DEFINES += BUILDING_EMBERCL
SOURCES += \
$$PRJ_DIR/DEOpenCLKernelCreator.cpp \