Skip to content

Commit

Permalink
Update README
Browse files Browse the repository at this point in the history
  • Loading branch information
MrKepzie committed Oct 3, 2014
1 parent 5c6deb7 commit bfd80d3
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 41 deletions.
2 changes: 1 addition & 1 deletion Global/GitVersion.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef NATRON_GITVERSION_H_
#define NATRON_GITVERSION_H_
#define GIT_BRANCH "workshop"
#define GIT_COMMIT "54c4e606d02285a738435289e67644a102621f62"
#define GIT_COMMIT "308e53410dfa5ad02aaef51f194ddf5c6e13b575"
#endif
10 changes: 0 additions & 10 deletions INSTALL_FREEBSD.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,6 @@ Download Cairo 1.12 and install.
make && make install
```

### Sigar

Download the binary from https://sourceforge.net/projects/sigar/files/sigar/1.6/
or compile it from github directly :
https://github.com/hyperic/sigar


We're done here for libraries.

###Add the config.pri file
Expand All @@ -79,9 +72,6 @@ LIBS is the path to the libs
boost: LIBS += -lboost_serialization
expat: LIBS += -lexpat
expat: PKGCONFIG -= expat
INCLUDEPATH+=/usr/local/include
LIBS+="-L/usr/local/lib"
LIBS+= -L/usr/local/lib -lsigar-x86-freebsd-6
EOF
----- end -----

Expand Down
8 changes: 0 additions & 8 deletions INSTALL_LINUX.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,6 @@ On Ubuntu 12.04 LTS the package can be added with the following ppa:
sudo add-apt-repository -y ppa:xorg-edgers/ppa
sudo apt-get install libcairo2-dev

### Hyperic-Sigar

Download the binary from https://sourceforge.net/projects/sigar/files/sigar/1.6/
or compile it from github directly :
https://github.com/hyperic/sigar

Make sure to install lib files in /usr/lib and includes in /usr/include

We're done here for libraries.

Expand Down Expand Up @@ -83,7 +76,6 @@ LIBS is the path to the libs
expat: LIBS += -lexpat
expat: PKGCONFIG -= expat
cairo: PKGCONFIG -= cairo
sigar: LIBS += -lsigar-amd64
EOF
----- end -----

Expand Down
7 changes: 0 additions & 7 deletions INSTALL_OSX.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,7 @@ With macports:
With macports:

sudo port install cairo

### Hyperic-Sigar

Download the binary from https://sourceforge.net/projects/sigar/files/sigar/1.6/
or compile it from github directly :
https://github.com/hyperic/sigar

Alternatively you can use the macports version.

Expand Down Expand Up @@ -101,8 +96,6 @@ LIBS is the path to the libs
cat > config.pri << EOF
INCLUDEPATH += /opt/local/include
LIBS += -L/opt/local/lib -lboost_serialization-mt
INCLUDEPATH += /usr/local/include
LIBS += -L/usr/local/lib -lsigar-universal64-macosx
EOF
----- end -----

Expand Down
15 changes: 0 additions & 15 deletions INSTALL_WINDOWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ Then this page has a complete answer on how to compile the dependencies:
http://stackoverflow.com/questions/85622/how-to-compile-cairo-for-visual-c-2008-express-edition
This will work successfully.

### Hyperic-Sigar

Download the binary from https://sourceforge.net/projects/sigar/files/sigar/1.6/
or compile it from github directly :
https://github.com/hyperic/sigar


###Add the config.pri file
Expand Down Expand Up @@ -117,11 +112,6 @@ cairo {
LIBS += -L$$quote(C:\\Users\\lex\\Documents\\GitHub\\Natron3rdParty\\cairo_1.12\\lib\\x64) -lcairo
}

sigar {
INCLUDEPATH += $$quote(C:\\Users\\lex\\Documents\\GitHub\\Natron3rdParty\\sigar_1.6.4\\include)
LIBS += -L$$quote(C:\\Users\\lex\\Documents\\GitHub\\Natron3rdParty\\sigar_1.6.4\\lib\\x64) -lsigar-amd64-winnt
}

}

32bit {
Expand Down Expand Up @@ -149,11 +139,6 @@ cairo {
LIBS += -L$$quote(C:\\Users\\lex\\Documents\\GitHub\\Natron3rdParty\\cairo_1.12\\lib\\x86) -lcairo
}

sigar {
INCLUDEPATH += $$quote(C:\\Users\\lex\\Documents\\GitHub\\Natron3rdParty\\sigar_1.6.4\\include)
LIBS += -L$$quote(C:\\Users\\lex\\Documents\\GitHub\\Natron3rdParty\\sigar_1.6.4\\lib\\x64) -lsigar-amd64-winnt
}

}

---------------------------------------------
Expand Down

0 comments on commit bfd80d3

Please sign in to comment.