-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Building: Added checkout script to keep main/sub repos in sync, and m…
…odified readme to reflect the new repo structure
- Loading branch information
1 parent
6528bbe
commit afbdffc
Showing
2 changed files
with
14 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
#EMStudio | ||
#EMSTune | ||
|
||
Written by Michael Carpenter ([email protected]), and licensed under GPLv2. | ||
|
||
|
@@ -8,13 +8,13 @@ I suppose I should have some real documentation here on how to use the different | |
|
||
### Binaries: | ||
|
||
I maintain Windows and Linux 32bit binaries of both the master and dev branches on my website: http://mikesshop.net/EMStudio/ | ||
I maintain Windows and Linux binaries of both the master and dev branches on my website: http://mikesshop.net/EMStudio/ | ||
|
||
### Compiling: | ||
|
||
#### Linux: | ||
|
||
A few packages are needed to compile EMStudio. In Ubuntu: | ||
A few packages are needed to compile EMStune. In Ubuntu: | ||
$ sudo apt-get update | ||
$ sudo apt-get install build-essential libqt4-dev libqt4-opengl-dev libqt4-opengl-dev qt4-qmake libqwt-dev libqt4-declarative libqjson-dev freeglut3-dev | ||
|
||
|
@@ -24,10 +24,11 @@ It has been mentioned before to run qmake -project, NEVER EVER EVER DO THIS!. Th | |
|
||
To checkout and build: | ||
|
||
$ git clone https://github.com/malcom2073/emstudio.git | ||
$ git clone https://github.com/malcom2073/emstune.git | ||
$ cd emstudio | ||
$ git checkout origin/BRANCHTOBUILD (typically dev or master) | ||
$ qmake | ||
$ git clone https://github.com/malcom2073/emstune-freeems.git plugins/freeems | ||
$ ./checkout.sh origin/BRANCHTOBUILD (typically dev or master, sometimes unstable) | ||
$ qmake -r | ||
$ make | ||
$ cd core | ||
$ ./emstudio | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
#!/bin/bash | ||
git checkout $1 | ||
cd plugins/freeems | ||
git checkout $1 | ||
cd .. | ||
cd .. | ||
|