Commit 97a5bc9f authored by Bart van der Velden's avatar Bart van der Velden

Previous merge went wrong (#53)

parent d2b7b724
......@@ -100,6 +100,7 @@ Building on Linux:
- make
- make test
To debug from the command line use: gdb musiccollection
For a release build use -DCMAKE_BUILD_TYPE=Release
If all went well, the software is now built and the unit tests were performed without
......@@ -129,15 +130,6 @@ Building on Linux:
Building on Windows
===================
<<<<<<< HEAD
- Sometimes the Qt5 cmake files cannot be found. In that case run something similar to: cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.2.0/gcc_64 ../musiccollection
- To build a debug version: cmake -DCMAKE_BUILD_TYPE:STRING=Debug ../MusicCollection
- After that: gdb musiccollection
=======
These steps were obtained from getting MusicCollection to work on two systems, one a
64 bit Windows 7 Enterprise and one 64 bit Windows 7 Home Premium.
>>>>>>> af1fc0aa18231ea4432be3cff91133ef23539bf6
Install CMake
-------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment