Skip to content

Commit

Permalink
Merge branch 'master' of /~https://github.com/lamogui/rmeditor
Browse files Browse the repository at this point in the history
  • Loading branch information
lamogui committed Jun 14, 2016
2 parents bbc4f3d + 3c3da25 commit 3c2c5ae
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
# rmeditor
Raymarching Editor by lamogui

This tool is initialy a merge between:
![screenshot](http://s31.postimg.org/jcs4o844r/screenshot.png)


## History
This demotool is initialy a merge of:
- [Visual Live System by xt95](/~https://github.com/XT95/VisualLiveSystem)
- [Tunefish4 by paynebc](/~https://github.com/paynebc/tunefish)

Some code came from [Enigma Studio 4 by Brain Control]
(/~https://github.com/enigmastudio/Enigma-Studio-4) because Tunefish4 code crashed
on linux.


## Requirements
* Qt5 (latest version on linux)
* QtCreator
Expand Down Expand Up @@ -37,16 +41,18 @@ cd build-dependencies
cmake-gui ../dependencies
```

###Windows
Check AUDIO_WINDOWS_WASAPI and/or AUDIO_WINDOWS_DS
####Windows
Check *AUDIO_WINDOWS_WASAPI* and/or *AUDIO_WINDOWS_DS*

####Linux
Check *AUDIO_LINUX_PULSE*

###Linux
Check AUDIO_LINUX_PULSE

####Debug/Release
In order to run the program in Debug and Release Mode you need to complie the
dependencies twice (use CMAKE_BUILD_TYPE with Debug, Release, or MinSizeRel)
dependencies twice (use *CMAKE_BUILD_TYPE* with *Debug*, *Release*, or *MinSizeRel*)

All dependencies should now be present inside the lib directory (the
All dependencies should now be present inside the *lib* directory (the
dependencies that end with d are the debug one).

You can now run QtCreator with **rmeditor.pro**
Expand Down

0 comments on commit 3c2c5ae

Please sign in to comment.