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

@ -16,7 +16,7 @@ INSTALLS += target
QMAKE_CXXFLAGS += -D_USRDLL
QMAKE_CXXFLAGS += -D_CONSOLE
QMAKE_CXXFLAGS += -BUILDING_EMBER
win32: DEFINES += BUILDING_EMBER
SOURCES += \
$$PRJ_DIR/Affine2D.cpp \
$$PRJ_DIR/DllMain.cpp \