Commit Graph

44 Commits

Author SHA1 Message Date
2da902d5f9 This change reverts PolyVox back to using Qt 4.8. This is expected to be a temporary change, required because moving to Qt 5 caused various complications on Windows which we are not yet ready to address.
For more details see here: https://bitbucket.org/volumesoffun/polyvox/issue/41/upgrade-to-qt-5
2014-05-05 20:29:52 +02:00
868fbb84a0 Update to use Qt5
The examples and tests now use Qt5. This allows some nice tidying of the
CMake files, some of which will come in future.

Closes issue #41
2014-03-09 18:02:24 +00:00
f5ea8878c2 Add a default CompilerCapabilities.h
This file assumes that the compiler doesn't support anything. If building
without CMake, it will be used and if you want to enable things, the file
can be edited.

When using CMake, a proper CompilerCapabilites.h will be generated and
CMake will set the include path order correctly in order to source the
correct file.
2012-12-26 12:54:52 +00:00
74f25eac23 Merge branch 'develop' into feature/cmake-cxx11-detect
Conflicts:
	examples/Basic/CMakeLists.txt
	examples/OpenGL/CMakeLists.txt
	examples/Paging/CMakeLists.txt
	examples/SmoothLOD/CMakeLists.txt
	library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
2012-12-24 20:08:31 +00:00
312a3def68 Fix GLEW compile error on Windows. 2012-11-26 23:15:19 +00:00
989cd453fe Consolidate glew into one location to speed up build. 2012-11-23 23:01:50 +00:00
3902e00a0f Add a CompilerCapabilities.h.in file which is filled in by CMake
It will #define a each of the basic features detected by CMake which can
then be used by other headers (like TypeDef.h) to set things up for
PolyVox.

It is this file which you will have to manually edit and rename if you want
to skip using CMake.
2012-11-23 15:41:26 +00:00
7f6d952dbe A better fix than 17a2a8e3d1 for GLEW 2012-11-19 12:05:29 +00:00
17a2a8e3d1 Fix include path for glew headers. 2012-11-19 10:44:10 +00:00
bc01223237 Removed some unecessary hierarchy in VS project structure.
Renamed the documentation targets in VS for clarity.
2012-09-28 14:07:13 +02:00
4b63c34305 Brought the manual and API docs together under the same heading in Visual Studio. 2012-09-28 13:54:27 +02:00
480c159327 Add copyright headers to all the CMake files 2012-08-24 13:20:41 +01:00
b96309f4a4 Use the CMake folder tool to help IDEs groupt targets.
This is done as seen in http://athile.net/library/blog/?p=288

Hopefully this works in Visual Studio as KDevelop doesn't use this feature.
2012-08-12 04:29:51 +01:00
9f0ae602b8 Increased warning level in Visual studio. 2011-07-19 22:09:24 +01:00
2da63912fb Renamed glew.c to glew.cpp to avoid compilation warnings with '-std=c++0x' 2011-06-18 23:38:02 +01:00
7d76a1bb69 CMake fixes for Windows. 2011-04-28 11:56:33 +01:00
ac0fb2b310 Make dynamic or static libraries optional
The user can choose static or dynamic libraries using
BUILD_STATIC_LIBRARIES and BUILD_DYNAMIC_LIBRARIES. By default
Windows will only build static libraries and Linux will build both.
2011-04-21 21:40:51 +02:00
ef52b906e6 Switched PoyVox to build as a static library. 2011-04-20 23:25:32 +01:00
c7514c975f More cleaning up of the Qt 'dependency'. Qt is now used by the tests, the OpenGL example and the documentation. These are of course all optional components. 2010-07-02 13:57:34 +00:00
4c8c1593c0 Removed '_d' from debug file names. 2010-03-08 23:22:05 +00:00
789cf60f68 Required .dlls now get installed next to example. 2010-03-07 23:26:29 +00:00
6f70396c9a Cleaner way of requesting Qt modules 2010-03-05 15:15:42 +00:00
e9b963acc2 Use shortcut variables to point to PolyVoxCore source and binary directories. 2010-03-02 22:24:56 +00:00
f3c9514f50 Link against GLU as well as GL since it seems that gluErrorString is in there in my version. 2010-03-02 21:49:36 +00:00
0db01213a7 Set Qt to be a required package 2010-03-02 16:08:33 +00:00
9df6288c67 Update Linux install paths to be FHS compliant. Windows paths should be unchanged. 2009-08-31 18:25:26 +00:00
97b162ee20 Work on basic logging framework. 2009-04-06 21:16:40 +00:00
df1bf690c9 Massive changes to the organisation of PolyVoxCore and PolyVoxYtil.
Also added start of logging capability.
2009-04-03 21:36:22 +00:00
a703bf7a43 Had to put the LIMK_DIRECTORIES line back in, as windows didn't work without it. 2009-03-30 19:43:38 +00:00
a4a8362dba Example builds now
Seg faults on running though
2009-03-30 13:09:23 +00:00
1fb999966f Put the bindings CMake stuff in a separate directory to keep things clean
Fully remove the if(win32) stuff from the examples
2009-03-29 23:02:03 +00:00
25898425f5 One or two things towards gettings it working on Linux.
At least now it _attempts_ to build the example :)
2009-03-29 00:32:28 +00:00
fc7cf98347 Started porting GLUT example to Qt. 2009-03-26 23:03:49 +00:00
a9ab2f2d4d Add first iteration of SDK building.
Builds a PolyVox NSIS installer with the 'package' target.
2009-03-26 18:03:21 +00:00
bd5acdb4cd Work on new OpenGL example - Splitting into several files. 2009-03-18 21:10:51 +00:00
a50bb8413e Work on new OpenGL example. 2009-03-18 20:44:05 +00:00
bdea87d6d6 Added setElements to Vector.
Work on new OpenGL example.
2009-03-13 22:10:32 +00:00
7c9cefc2d6 Add missing headers causing compile errors on Linux
Don't build GL example at all on Linux
Add PolyVoxConfig.cmake file
2008-11-22 20:09:59 +00:00
8b98d69d4e Initial LOD working. 2008-07-07 21:20:30 +00:00
29ef5f021e Rearranging files in PolyVox. 2008-07-03 19:17:17 +00:00
f8a090abba Moving stuff around - not currently buildable! 2008-06-08 19:48:39 +00:00
2374082542 Work on CMake for OpenGL example. 2008-06-08 18:49:04 +00:00
f75805999d Reorganising some code... 2008-06-08 17:51:36 +00:00
f6f5cb524d Initial check-in of OpenGL example. Doesn't do anything yet. 2008-06-08 15:09:45 +00:00