ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding windows build information

Browse source
This commit is contained in:
Ilusha 2024-03-09 10:29:02 +03:00
parent ac4f08c67c
commit cce9609ced
4 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeOptions.txt
View file

@ -1,5 +1,7 @@
option(MODULES_MEMORY_DEBUG "Debug memory" ON) 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) if (MODULES_MEMORY_DEBUG)
add_compile_definitions(MEM_DEBUG) add_compile_definitions(MEM_DEBUG)
endif () endif ()

2
Containers/public/IntervalTree.hpp
View file

@ -46,7 +46,7 @@ namespace tp {
template <typename tType, typename tData> template <typename tType, typename tData>
class IntervalTree : public AvlTree<IntervalKey<tType>, tData> { class IntervalTree : public AvlTree<IntervalKey<tType>, tData> {
typedef AvlTree<IntervalKey<tType>, tData>::Node Node; typedef typename AvlTree<IntervalKey<tType>, tData>::Node Node;
public: public:
IntervalTree() = default; IntervalTree() = default;

9
Externals/CMakeLists.txt vendored
View file

@ -1,13 +1,16 @@
# find_package(ALSA REQUIRED) # find_package(ALSA REQUIRED)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows") 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) find_package(GLEW REQUIRED)
set(GLEW_LIB ${GLEW_STATIC_LIBRARY_RELEASE} opengl32.lib PARENT_SCOPE) set(GLEW_LIB ${GLEW_STATIC_LIBRARY_RELEASE} opengl32.lib PARENT_SCOPE)
# Your relative paths # Your relative paths
set(RELATIVE_INCLUDE_DIR "../../ModulesWindowsLibraries/portaudio/include") set(RELATIVE_INCLUDE_DIR "${WINDOWS_LIBRARIES}/portaudio/include")
set(RELATIVE_LIB "../../ModulesWindowsLibraries/portaudio_build/Debug/portaudio.lib") set(RELATIVE_LIB "${WINDOWS_LIBRARIES}/portaudio_build/Debug/portaudio.lib")
# Convert to absolute paths # Convert to absolute paths
get_filename_component(ABSOLUTE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_INCLUDE_DIR}" ABSOLUTE) get_filename_component(ABSOLUTE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_INCLUDE_DIR}" ABSOLUTE)

6
README.MD
View file

@ -1 +1,5 @@
Modules. 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