mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-07-09 03:25:52 +00:00
Merge branch 'master' into urde-tags
This commit is contained in:
commit
cd1a00e610
30
README.md
30
README.md
@ -16,3 +16,33 @@ Precompiled builds are available at https://github.com/AxioDL/urde/releases
|
|||||||
* LLVM
|
* LLVM
|
||||||
* [Specialized Windows Package](https://www.dropbox.com/s/4u0rckvh3d3tvr1/LLVM-3.7.0-win64.exe)
|
* [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)
|
* [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`
|
||||||
|
@ -247,10 +247,11 @@ class TLockedToken : public TToken<T>
|
|||||||
{
|
{
|
||||||
T* m_obj;
|
T* m_obj;
|
||||||
public:
|
public:
|
||||||
TLockedToken() {m_obj = nullptr;}
|
TLockedToken() : m_obj(nullptr) {}
|
||||||
TLockedToken(const CToken& other) : TToken<T>(other) {m_obj = TToken<T>::GetObj();}
|
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();}
|
TLockedToken(CToken&& other) : TToken<T>(std::move(other)) {m_obj = TToken<T>::GetObj();}
|
||||||
T* GetObj() {return m_obj;}
|
T* GetObj() {return m_obj;}
|
||||||
|
T* operator->() {return m_obj;}
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user