mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-05 15:54:50 -04:00
--Bug fixes
-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.
This commit is contained in:
@ -1,14 +1,15 @@
|
||||
#ifndef FRACTORIUM_PCH
|
||||
#define FRACTORIUM_PCH
|
||||
#ifndef FRACTORIUM_PCH_H
|
||||
#define FRACTORIUM_PCH_H//GCC doesn't like #pragma once
|
||||
|
||||
#define GL_GLEXT_PROTOTYPES 1
|
||||
#define XFORM_COLOR_COUNT 14
|
||||
|
||||
#undef QT_OPENGL_ES_2//Make absolutely sure OpenGL ES is not used.
|
||||
#define QT_NO_OPENGL_ES_2
|
||||
#ifdef _WIN32
|
||||
#pragma warning(disable : 4251; disable : 4661; disable : 4100)
|
||||
#endif
|
||||
|
||||
#ifndef WIN32
|
||||
#include <QtWidgets>
|
||||
//Has to come first on non-Windows platforms due to some weird naming collisions on *nix.
|
||||
#ifndef _WIN32
|
||||
#include <QtWidgets>
|
||||
#endif
|
||||
|
||||
#include "Renderer.h"
|
||||
@ -21,8 +22,8 @@
|
||||
#include "JpegUtils.h"
|
||||
#include "EmberCommon.h"
|
||||
|
||||
#ifdef WIN32
|
||||
#include <QtWidgets>
|
||||
#ifdef _WIN32
|
||||
#include <QtWidgets>
|
||||
#endif
|
||||
|
||||
#include <deque>
|
||||
@ -77,12 +78,11 @@
|
||||
#include "glm/gtc/matrix_transform.hpp"
|
||||
#include "glm/gtc/type_ptr.hpp"
|
||||
|
||||
#ifndef WIN32
|
||||
#undef Bool
|
||||
#ifndef _WIN32
|
||||
#undef Bool
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
using namespace EmberNs;
|
||||
using namespace EmberCLns;
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user