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

Example builds now

Browse Source 
Seg faults on running though
This commit is contained in:
Matt Williams 2009-03-30 13:09:23 +00:00
parent 1fb999966f
commit a4a8362dba
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/OpenGL/CMakeLists.txt
View File

@ -49,11 +49,10 @@ FIND_PACKAGE(OpenGL REQUIRED)
#Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} "../../library/include") INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} "../../library/include")
LINK_DIRECTORIES("../../library")
#Build #Build
ADD_EXECUTABLE(OpenGLExample ${SRC_FILES}) ADD_EXECUTABLE(OpenGLExample ${SRC_FILES})
TARGET_LINK_LIBRARIES(OpenGLExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} debug PolyVoxCore_d.lib optimized PolyVoxCore.lib) TARGET_LINK_LIBRARIES(OpenGLExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} debug PolyVoxCore_d optimized PolyVoxCore)
#Install #Install
INSTALL(TARGETS OpenGLExample INSTALL(TARGETS OpenGLExample
@ -62,5 +61,3 @@ INSTALL(TARGETS OpenGLExample
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
COMPONENT example COMPONENT example
) )
ADD_DEPENDENCIES(OpenGLExample PolyVoxCore) #This shouldn't be needed?

4
library/bindings/CMakeLists.txt
View File

@ -6,9 +6,9 @@ if(SWIG_FOUND)
include_directories(${PYTHON_INCLUDE_PATH}) include_directories(${PYTHON_INCLUDE_PATH})
set(CMAKE_SWIG_FLAGS "") set(CMAKE_SWIG_FLAGS "")
set_source_files_properties(bindings/PolyVoxCore.i PROPERTIES CPLUSPLUS ON) set_source_files_properties(PolyVoxCore.i PROPERTIES CPLUSPLUS ON)
swig_add_module(PolyVoxCore python bindings/PolyVoxCore.i) swig_add_module(PolyVoxCore python PolyVoxCore.i)
swig_link_libraries(PolyVoxCore ${PYTHON_LIBRARIES} PolyVoxCore) swig_link_libraries(PolyVoxCore ${PYTHON_LIBRARIES} PolyVoxCore)
set_target_properties(${SWIG_MODULE_PolyVoxCore_REAL_NAME} PROPERTIES SUFFIX ".pyd") set_target_properties(${SWIG_MODULE_PolyVoxCore_REAL_NAME} PROPERTIES SUFFIX ".pyd")
endif() endif()

2
library/include/PolyVoxCore/Vector.inl
View File

@ -169,7 +169,7 @@ namespace PolyVox
bool equal = true; bool equal = true;
for(uint32 ct = 0; ct < Size; ++ct) for(uint32 ct = 0; ct < Size; ++ct)
{ {
if(m_tElements[ct] != rhs(ct)) if(m_tElements[ct] != rhs.getElement(ct))
{ {
equal = false; equal = false;
break; break;