diff --git a/CMakeOptions.txt b/CMakeOptions.txt index c185d26..742e8ad 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -1,5 +1,7 @@ option(MODULES_MEMORY_DEBUG "Debug memory" ON) +set(WINDOWS_LIBRARIES "../../ModulesWindowsLibraries" CACHE STRING "Svn repository with windows libraries https://svn.riouxsvn.com/moduleswindowsl") + if (MODULES_MEMORY_DEBUG) add_compile_definitions(MEM_DEBUG) endif () diff --git a/Containers/public/IntervalTree.hpp b/Containers/public/IntervalTree.hpp index bfc55c0..261e402 100644 --- a/Containers/public/IntervalTree.hpp +++ b/Containers/public/IntervalTree.hpp @@ -46,7 +46,7 @@ namespace tp { template class IntervalTree : public AvlTree, tData> { - typedef AvlTree, tData>::Node Node; + typedef typename AvlTree, tData>::Node Node; public: IntervalTree() = default; diff --git a/Externals/CMakeLists.txt b/Externals/CMakeLists.txt index c82fc6e..ac1f6c7 100644 --- a/Externals/CMakeLists.txt +++ b/Externals/CMakeLists.txt @@ -1,13 +1,16 @@ # find_package(ALSA REQUIRED) if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - set(CMAKE_PREFIX_PATH "../../ModulesWindowsLibraries/glew-2.1.0") + message("Configuring for windows...") + message("Libraries path is - ${WINDOWS_LIBRARIES}") + + set(CMAKE_PREFIX_PATH "${WINDOWS_LIBRARIES}/glew-2.1.0") find_package(GLEW REQUIRED) set(GLEW_LIB ${GLEW_STATIC_LIBRARY_RELEASE} opengl32.lib PARENT_SCOPE) # Your relative paths - set(RELATIVE_INCLUDE_DIR "../../ModulesWindowsLibraries/portaudio/include") - set(RELATIVE_LIB "../../ModulesWindowsLibraries/portaudio_build/Debug/portaudio.lib") + set(RELATIVE_INCLUDE_DIR "${WINDOWS_LIBRARIES}/portaudio/include") + set(RELATIVE_LIB "${WINDOWS_LIBRARIES}/portaudio_build/Debug/portaudio.lib") # Convert to absolute paths get_filename_component(ABSOLUTE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_INCLUDE_DIR}" ABSOLUTE) diff --git a/README.MD b/README.MD index 5beb67b..692d498 100644 --- a/README.MD +++ b/README.MD @@ -1 +1,5 @@ -Modules. \ No newline at end of file +Modules + +See TODO and STATUS + +To build and debug on windows clone svn repository (https://svn.riouxsvn.com/moduleswindowsl) alongside this repo and check WINDOWS_LIBRARIES option in cmake \ No newline at end of file