mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-22 13:40:06 -05:00
7c856c929c
-Really fix locking of affine scale. --Code changes -Remove dependency projects from the solution. Move to a project design where they are built once via command line and stored in a /Deps folder. --Because of this, libpng is built as a static lib instead of a dll because that's what its command line makefile supports. --Remove libpng16.dll from Wix installer. -Remove all configs except for debug and release. -Remove all platforms except for x64. -Add #define __TBB_NO_IMPLICIT_LINKAGE 1 to prevent tbb from locking for tbb_debug.lib by default on debug builds. -Put Ember.rc in a filter folder in the project. -Place pragma warning disable statements in PCH files rather than in projects. This makes it easier when using Qt Creator. -Move all resource files to the MSVC folder. -Set all targets in QtCreator project to their lowercase names to be more *nix friendly. Set -l link statements to use these new lowercase names for ember and embercl. -Rework projects to favor shadow builds. -Remove the symlinks.sh file and all references to it. It was never needed. Instead, just specify multiple include and link paths in the .pro files. -Change WIN32 to _WIN32. -Fix a few code warnings.
89 lines
1.9 KiB
C++
89 lines
1.9 KiB
C++
#ifndef FRACTORIUM_PCH_H
|
|
#define FRACTORIUM_PCH_H//GCC doesn't like #pragma once
|
|
|
|
#define XFORM_COLOR_COUNT 14
|
|
|
|
#ifdef _WIN32
|
|
#pragma warning(disable : 4251; disable : 4661; disable : 4100)
|
|
#endif
|
|
|
|
//Has to come first on non-Windows platforms due to some weird naming collisions on *nix.
|
|
#ifndef _WIN32
|
|
#include <QtWidgets>
|
|
#endif
|
|
|
|
#include "Renderer.h"
|
|
#include "RendererCL.h"
|
|
#include "VariationList.h"
|
|
#include "OpenCLWrapper.h"
|
|
#include "XmlToEmber.h"
|
|
#include "EmberToXml.h"
|
|
#include "SheepTools.h"
|
|
#include "JpegUtils.h"
|
|
#include "EmberCommon.h"
|
|
|
|
#ifdef _WIN32
|
|
#include <QtWidgets>
|
|
#endif
|
|
|
|
#include <deque>
|
|
#include "qfunctions.h"
|
|
#include <QApplication>
|
|
#include <QBrush>
|
|
#include <QColor>
|
|
#include <QColorDialog>
|
|
#include <QComboBox>
|
|
#include <QDebug>
|
|
#include <QDoubleSpinBox>
|
|
#include <QFileInfo>
|
|
#include <QFont>
|
|
#include <QFontDialog>
|
|
#include <QFontMetrics>
|
|
#include <QFuture>
|
|
#include <QGraphicsView>
|
|
#include <QIcon>
|
|
#include <QImageReader>
|
|
#include <QItemDelegate>
|
|
#include <QLineEdit>
|
|
#include <QMenu>
|
|
#include <QModelIndex>
|
|
#include <qopenglfunctions_2_0.h>
|
|
#include <QOpenGLWidget>
|
|
#include <QPainterPath>
|
|
#include <QPushButton>
|
|
#include <QSettings>
|
|
#include <QSignalMapper>
|
|
#include <QSpinBox>
|
|
#include <QStandardPaths>
|
|
#include <QTextEdit>
|
|
#include <QTimer>
|
|
#include <QToolBar>
|
|
#include <QTreeWidget>
|
|
#include <QWheelEvent>
|
|
#include <QtConcurrentRun>
|
|
#include <QtCore/QMultiHash>
|
|
#include <QtCore/QPair>
|
|
#include <QtCore/QSharedData>
|
|
#include <QtCore/QSize>
|
|
#include <QtCore/QStringList>
|
|
#include <QtCore/QVariant>
|
|
#include <QtCore/QVector>
|
|
#include <QtCore/qglobal.h>
|
|
#include <QtGui/QFont>
|
|
#include <QtGui/QPalette>
|
|
#include <QtGui/QSyntaxHighlighter>
|
|
#include <QtWidgets/QMainWindow>
|
|
|
|
#include "glm/glm.hpp"
|
|
#include "glm/gtc/matrix_transform.hpp"
|
|
#include "glm/gtc/type_ptr.hpp"
|
|
|
|
#ifndef _WIN32
|
|
#undef Bool
|
|
#endif
|
|
|
|
using namespace std;
|
|
using namespace EmberNs;
|
|
using namespace EmberCLns;
|
|
#endif
|