AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Fix PolyVox library versioning

Browse Source 
There's no need to link PolyVox against 'nothing'
This commit is contained in:
Matt Williams 2008-05-25 20:56:35 +00:00
parent db9287303c
commit 29d1cd8ad1
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -1,5 +1,10 @@
PROJECT(PolyVox)
SET(POLYVOX_VERSION_MAJOR "0")
SET(POLYVOX_VERSION_MINOR "1")
SET(POLYVOX_VERSION_PATCH "0")
SET(POLYVOX_VERSION "${POLYVOX_VERSION_MAJOR}.${POLYVOX_VERSION_MINOR}.${POLYVOX_VERSION_PATCH}")
#Projects source files
SET(SRC_FILES
source/IndexedSurfacePatch.cpp
@ -64,8 +69,8 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include)
#Build
ADD_LIBRARY(PolyVox SHARED ${SRC_FILES} ${INC_FILES})
TARGET_LINK_LIBRARIES(PolyVox)
SET_TARGET_PROPERTIES(PolyVox PROPERTIES VERSION ${THERMITE_VERSION} SOVERSION ${THERMITE_VERSION_MAJOR})
#TARGET_LINK_LIBRARIES(PolyVox)
SET_TARGET_PROPERTIES(PolyVox PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR})
IF(WIN32)
SET_TARGET_PROPERTIES(PolyVox PROPERTIES COMPILE_FLAGS "/wd4251") #Disable warning on STL exports
ENDIF(WIN32)

2
source/Region.cpp
View File

@ -63,4 +63,4 @@ namespace PolyVox
m_v3dUpperCorner.setY((std::min)(m_v3dUpperCorner.y(), other.m_v3dUpperCorner.y()));
m_v3dUpperCorner.setZ((std::min)(m_v3dUpperCorner.z(), other.m_v3dUpperCorner.z()));
}
}
}