Add missing headers causing compile errors on Linux
Don't build GL example at all on Linux Add PolyVoxConfig.cmake file
This commit is contained in:
parent
68d0353cff
commit
7c9cefc2d6
@ -5,6 +5,4 @@ PROJECT(PolyVox)
|
|||||||
#ADD_SUBDIRECTORY(PolyVoxCore)
|
#ADD_SUBDIRECTORY(PolyVoxCore)
|
||||||
#ADD_SUBDIRECTORY(PolyVoxUtil)
|
#ADD_SUBDIRECTORY(PolyVoxUtil)
|
||||||
ADD_SUBDIRECTORY(library)
|
ADD_SUBDIRECTORY(library)
|
||||||
ADD_SUBDIRECTORY(examples/OpenGL)
|
ADD_SUBDIRECTORY(examples/OpenGL)
|
||||||
|
|
||||||
ADD_DEPENDENCIES(OpenGLExample PolyVoxCore)
|
|
@ -16,9 +16,9 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
|
|||||||
SOURCE_GROUP("Sources" FILES ${SRC_FILES})
|
SOURCE_GROUP("Sources" FILES ${SRC_FILES})
|
||||||
#SOURCE_GROUP("Headers" FILES ${INC_FILES})
|
#SOURCE_GROUP("Headers" FILES ${INC_FILES})
|
||||||
|
|
||||||
FIND_PACKAGE(OpenGL REQUIRED)
|
|
||||||
|
|
||||||
IF (WIN32)
|
IF (WIN32)
|
||||||
|
FIND_PACKAGE(OpenGL REQUIRED)
|
||||||
|
|
||||||
#NOTE: In Windows I haven't had much luck getting the FindGLUT script to work correctly.
|
#NOTE: In Windows I haven't had much luck getting the FindGLUT script to work correctly.
|
||||||
#The easiest solution has been to install GLUT alongside OpenGL, which is already in the system path.
|
#The easiest solution has been to install GLUT alongside OpenGL, which is already in the system path.
|
||||||
#This means glut.h and glut32.lib go in the 'include' and 'lib' folders within Microsoft Visual Studio 8\VC\PlatformSDK\
|
#This means glut.h and glut32.lib go in the 'include' and 'lib' folders within Microsoft Visual Studio 8\VC\PlatformSDK\
|
||||||
@ -32,11 +32,13 @@ IF (WIN32)
|
|||||||
#Build
|
#Build
|
||||||
ADD_EXECUTABLE(OpenGLExample ${SRC_FILES})
|
ADD_EXECUTABLE(OpenGLExample ${SRC_FILES})
|
||||||
TARGET_LINK_LIBRARIES(OpenGLExample glut32.lib ${OPENGL_gl_LIBRARY} debug PolyVoxCore_d.lib optimized PolyVoxCore.lib)
|
TARGET_LINK_LIBRARIES(OpenGLExample glut32.lib ${OPENGL_gl_LIBRARY} debug PolyVoxCore_d.lib optimized PolyVoxCore.lib)
|
||||||
ENDIF (WIN32)
|
|
||||||
|
|
||||||
#Install
|
#Install
|
||||||
INSTALL(TARGETS OpenGLExample
|
INSTALL(TARGETS OpenGLExample
|
||||||
RUNTIME DESTINATION bin
|
RUNTIME DESTINATION bin
|
||||||
LIBRARY DESTINATION lib
|
LIBRARY DESTINATION lib
|
||||||
ARCHIVE DESTINATION lib
|
ARCHIVE DESTINATION lib
|
||||||
)
|
)
|
||||||
|
|
||||||
|
ADD_DEPENDENCIES(OpenGLExample PolyVoxCore)
|
||||||
|
ENDIF (WIN32)
|
@ -124,3 +124,13 @@ INSTALL(TARGETS PolyVoxUtil
|
|||||||
)
|
)
|
||||||
|
|
||||||
INSTALL(FILES ${UTIL_INC_FILES} DESTINATION include/PolyVoxUtil)
|
INSTALL(FILES ${UTIL_INC_FILES} DESTINATION include/PolyVoxUtil)
|
||||||
|
|
||||||
|
#Set up OGREConfig.cmake
|
||||||
|
if(WIN32)
|
||||||
|
set(CONFIG_FILE_DIR "CMake")
|
||||||
|
else(WIN32)
|
||||||
|
set(CONFIG_FILE_DIR "lib/PolyVox/CMake")
|
||||||
|
endif(WIN32)
|
||||||
|
|
||||||
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PolyVoxConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PolyVoxConfig.cmake)
|
||||||
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PolyVoxConfig.cmake DESTINATION ${CONFIG_FILE_DIR})
|
||||||
|
23
library/PolyVoxConfig.cmake.in
Normal file
23
library/PolyVoxConfig.cmake.in
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
# Find PolyVox includes and library
|
||||||
|
#
|
||||||
|
# This module defines
|
||||||
|
# PolyVox_INCLUDE_DIRS
|
||||||
|
# PolyVox_LIBRARIES, the libraries to link against to use OGRE.
|
||||||
|
# PolyVox_LIBRARY_DIRS, the location of the libraries
|
||||||
|
# PolyVox_FOUND, If false, do not try to use OGRE
|
||||||
|
#
|
||||||
|
# Copyright © 2008, Matt Williams
|
||||||
|
#
|
||||||
|
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||||
|
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||||
|
|
||||||
|
include(FindPackageMessage)
|
||||||
|
|
||||||
|
set(PREFIX "@CMAKE_INSTALL_PREFIX@")
|
||||||
|
set(PolyVox_LIBRARY_DIRS "${PREFIX}/lib")
|
||||||
|
set(PolyVox_INCLUDE_DIRS "${PREFIX}/include/PolyVoxCore" "${PREFIX}/include/PolyVoxUtil")
|
||||||
|
set(PolyVox_LIBRARIES "PolyVoxUtil" "PolyVoxCore")
|
||||||
|
|
||||||
|
message(STATUS "Found PolyVox")
|
||||||
|
message(STATUS " libraries : '${PolyVox_LIBRARIES}' from ${PolyVox_LIBRARY_DIRS}")
|
||||||
|
message(STATUS " includes : ${PolyVox_INCLUDE_DIRS}")
|
@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||||||
#include "Block.h"
|
#include "Block.h"
|
||||||
#include "BlockVolume.h"
|
#include "BlockVolume.h"
|
||||||
#include "Vector.h"
|
#include "Vector.h"
|
||||||
|
#include "Region.h"
|
||||||
#pragma endregion
|
#pragma endregion
|
||||||
|
|
||||||
namespace PolyVox
|
namespace PolyVox
|
||||||
|
@ -26,6 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||||||
|
|
||||||
#include "PolyVoxForwardDeclarations.h"
|
#include "PolyVoxForwardDeclarations.h"
|
||||||
|
|
||||||
|
#include <cassert>
|
||||||
|
|
||||||
namespace PolyVox
|
namespace PolyVox
|
||||||
{
|
{
|
||||||
POLYVOX_API uint8 logBase2(uint32 uInput);
|
POLYVOX_API uint8 logBase2(uint32 uInput);
|
||||||
|
@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
namespace PolyVox
|
namespace PolyVox
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user