AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into urde-tags

This commit is contained in:
Jack Andersen 2016-03-04 18:51:04 -10:00
parent b576778427 de9a14dc1e
commit cd1a00e610
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
README.md
View File

@ -16,3 +16,33 @@ Precompiled builds are available at https://github.com/AxioDL/urde/releases
* LLVM
* [Specialized Windows Package](https://www.dropbox.com/s/4u0rckvh3d3tvr1/LLVM-3.7.0-win64.exe)
* [OS X Package](http://llvm.org/releases/3.7.0/clang+llvm-3.7.0-x86_64-apple-darwin.tar.xz)
* [Visual Studio 2015 and Windows SDK](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx) (windows users)
### Build Directions (Release)
#### make
```sh
git clone https://github.com/AxioDL/urde.git
mkdir urde-build
cd urde
git submodule update --init --recursive
cd ../urde-build
cmake -DCMAKE_BUILD_TYPE=Release ../urde
make
```
#### Visual Studio
Using *Git Shell* with [GitHub for Windows](https://desktop.github.com/)
```sh
git clone https://github.com/AxioDL/urde.git
mkdir urde-build
cd urde
git submodule update --init --recursive
cd ../urde-build
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Release ../urde
```
Then open `urde.sln`

3
Runtime/CToken.hpp
View File

@ -247,10 +247,11 @@ class TLockedToken : public TToken<T>
{
T* m_obj;
public:
TLockedToken() {m_obj = nullptr;}
TLockedToken() : m_obj(nullptr) {}
TLockedToken(const CToken& other) : TToken<T>(other) {m_obj = TToken<T>::GetObj();}
TLockedToken(CToken&& other) : TToken<T>(std::move(other)) {m_obj = TToken<T>::GetObj();}
T* GetObj() {return m_obj;}
T* operator->() {return m_obj;}
};
}