From 06d433f55956010cd64ab08f5b9613a6795a0722 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 24 May 2008 09:29:20 +0000 Subject: [PATCH] Work on seperating PolyVox and Thermite. Now they are two seperate solutions. --- CMakeLists.txt | 16 +++++++++------- include/VolumeIterator.inl | 2 -- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa16d384..5e3942cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -PROJECT(PolyVoxSceneManager) +PROJECT(PolyVox) #Projects source files SET(SRC_FILES @@ -58,16 +58,18 @@ SOURCE_GROUP("Headers" FILES ${INC_FILES}) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include) #Build -ADD_LIBRARY(PolyVoxSceneManager SHARED ${SRC_FILES} ${INC_FILES}) -TARGET_LINK_LIBRARIES(PolyVoxSceneManager) -SET_TARGET_PROPERTIES(PolyVoxSceneManager PROPERTIES VERSION ${THERMITE_VERSION} SOVERSION ${THERMITE_VERSION_MAJOR}) +ADD_LIBRARY(PolyVox SHARED ${SRC_FILES} ${INC_FILES}) +TARGET_LINK_LIBRARIES(PolyVox) +SET_TARGET_PROPERTIES(PolyVox PROPERTIES VERSION ${THERMITE_VERSION} SOVERSION ${THERMITE_VERSION_MAJOR}) IF(WIN32) - SET_TARGET_PROPERTIES(PolyVoxSceneManager PROPERTIES COMPILE_FLAGS "/wd4251") #Disable warning on STL exports + SET_TARGET_PROPERTIES(PolyVox PROPERTIES COMPILE_FLAGS "/wd4251") #Disable warning on STL exports ENDIF(WIN32) #Install -INSTALL(TARGETS PolyVoxSceneManager +INSTALL(TARGETS PolyVox RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib -) \ No newline at end of file +) + +INSTALL(FILES ${INC_FILES} DESTINATION include/PolyVox) \ No newline at end of file diff --git a/include/VolumeIterator.inl b/include/VolumeIterator.inl index 56324fcd..717f7b3b 100644 --- a/include/VolumeIterator.inl +++ b/include/VolumeIterator.inl @@ -212,8 +212,6 @@ namespace PolyVox template void VolumeIterator::setVoxel(VoxelType tValue) { - assert(mVolume.isVoxelLocked(mXPosInVolume,mYPosInVolume,mZPosInVolume)); - const boost::uint32_t uBlockIndex = mXBlock + mYBlock * mVolume.m_uSideLengthInBlocks +