diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt index e2ed1bec..407bb199 100644 --- a/examples/OpenGL/CMakeLists.txt +++ b/examples/OpenGL/CMakeLists.txt @@ -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) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} "../../library/include") -LINK_DIRECTORIES("../../library") #Build 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(TARGETS OpenGLExample @@ -62,5 +61,3 @@ INSTALL(TARGETS OpenGLExample ARCHIVE DESTINATION lib COMPONENT example ) - -ADD_DEPENDENCIES(OpenGLExample PolyVoxCore) #This shouldn't be needed? diff --git a/library/bindings/CMakeLists.txt b/library/bindings/CMakeLists.txt index ee50cdaa..2653a94d 100644 --- a/library/bindings/CMakeLists.txt +++ b/library/bindings/CMakeLists.txt @@ -6,9 +6,9 @@ if(SWIG_FOUND) include_directories(${PYTHON_INCLUDE_PATH}) 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) set_target_properties(${SWIG_MODULE_PolyVoxCore_REAL_NAME} PROPERTIES SUFFIX ".pyd") endif() \ No newline at end of file diff --git a/library/include/PolyVoxCore/Vector.inl b/library/include/PolyVoxCore/Vector.inl index 6381fd7d..93d3dca9 100644 --- a/library/include/PolyVoxCore/Vector.inl +++ b/library/include/PolyVoxCore/Vector.inl @@ -169,7 +169,7 @@ namespace PolyVox bool equal = true; for(uint32 ct = 0; ct < Size; ++ct) { - if(m_tElements[ct] != rhs(ct)) + if(m_tElements[ct] != rhs.getElement(ct)) { equal = false; break;