Skip to content

Commit

Permalink
Building: Added checkout script to keep main/sub repos in sync, and m…
Browse files Browse the repository at this point in the history
…odified readme to reflect the new repo structure
  • Loading branch information
malcom2073 committed Aug 5, 2014
1 parent 6528bbe commit afbdffc
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
13 changes: 7 additions & 6 deletions README.md
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.

Expand All @@ -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

Expand All @@ -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
Expand Down
7 changes: 7 additions & 0 deletions checkout.sh
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 ..

0 comments on commit afbdffc

Please sign in to comment.