mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-22 05:30: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.
55 lines
1.1 KiB
C++
55 lines
1.1 KiB
C++
#ifdef _WIN32
|
|
#pragma once
|
|
#endif
|
|
|
|
/// <summary>
|
|
/// Precompiled header file. Place all system includes here with appropriate #defines for different operating systems and compilers.
|
|
/// </summary>
|
|
|
|
#define NOMINMAX
|
|
#define WIN32_LEAN_AND_MEAN//Exclude rarely-used stuff from Windows headers.
|
|
#define _USE_MATH_DEFINES
|
|
|
|
#include "Timing.h"
|
|
#include "Renderer.h"
|
|
|
|
#if defined(_WIN32)
|
|
#pragma warning(disable : 4251; disable : 4661; disable : 4100)
|
|
#include <windows.h>
|
|
#include <SDKDDKVer.h>
|
|
#include "GL/gl.h"
|
|
#elif defined(__APPLE__)
|
|
#include <OpenGL/gl.h>
|
|
#else
|
|
#include "GL/glx.h"
|
|
#endif
|
|
|
|
#include <utility>
|
|
#include <CL/cl.hpp>
|
|
#include <algorithm>
|
|
#include <atomic>
|
|
#include <cstdio>
|
|
#include <cstdlib>
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <set>
|
|
#include <string>
|
|
#include <iterator>
|
|
#include <time.h>
|
|
#include <unordered_map>
|
|
|
|
#ifdef _WIN32
|
|
#if defined(BUILDING_EMBERCL)
|
|
#define EMBERCL_API __declspec(dllexport)
|
|
#else
|
|
#define EMBERCL_API __declspec(dllimport)
|
|
#endif
|
|
#else
|
|
#define EMBERCL_API
|
|
#endif
|
|
|
|
using namespace std;
|
|
using namespace EmberNs;
|
|
//#define TEST_CL 1
|
|
//#define TEST_CL_BUFFERS 1
|