Wed, 23 Oct 2013 12:46:10 +0300
Merge branch 'master' into gl
Conflicts:
src/file.cpp
src/gldraw.cpp
src/gldraw.h
src/gui.cpp
src/ldtypes.cpp
src/src.pro
src/types.h
###################################################################### # Automatically generated by qmake (2.01a) Sat Sep 22 17:29:49 2012 ###################################################################### TEMPLATE = app TARGET = ldforge SUBDIRS += ./src TARGET = ldforge DEPENDPATH += . INCLUDEPATH += . ./build/ RC_FILE = ldforge.rc RESOURCES = ldforge.qrc RCC_DIR = ./build/ MOC_DIR = ./build/ RCC_DIR = ./build/ UI_DIR = ./build/ SOURCES = src/*.cpp HEADERS = src/*.h FORMS = ui/*.ui QT += opengl network QMAKE_CXXFLAGS += -std=c++0x CONFIG += debug_and_release CONFIG (debug, debug|release) { TARGET = ldforge_debug DEFINES += DEBUG OBJECTS_DIR = ./build_debug/ } else { TARGET = ldforge DEFINES += RELEASE OBJECTS_DIR = ./build_release/ } unix { LIBS += -lGLU }