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

Merge branch 'master' of https://github.com/AxioDL/urde

This commit is contained in:
Phillip Stephens 2016-03-05 18:55:38 -08:00
parent b0873ccc55 087a2bd4e6
commit 7132f04b44
5 changed files with 65 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -2,8 +2,12 @@ cmake_minimum_required(VERSION 3.0)
cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0054 NEW)
project(urde) project(urde)
if(MSVC) if(MSVC)
if(${CMAKE_GENERATOR} MATCHES "Visual Studio*")
set(VS_DEFINES "/MP")
endif()
# Shaddup MSVC # Shaddup MSVC
add_definitions(-DUNICODE=1 -D_UNICODE=1 -D__SSE__=1 -D_CRT_SECURE_NO_WARNINGS=1 -DD_SCL_SECURE_NO_WARNINGS=1 /wd4267 /wd4244 /wd4305 /MP) add_definitions(-DUNICODE=1 -D_UNICODE=1 -D__SSE__=1 -D_CRT_SECURE_NO_WARNINGS=1 -DD_SCL_SECURE_NO_WARNINGS=1 /wd4267 /wd4244 /wd4305 ${VS_DEFINES})
# Link-time Code Generation for Release builds # Link-time Code Generation for Release builds
set(CMAKE_C_FLAGS_RELEASE "/DNDEBUG /O2 /Oy /GL /Gy /MD") set(CMAKE_C_FLAGS_RELEASE "/DNDEBUG /O2 /Oy /GL /Gy /MD")

58
README.md
View File

@ -1,8 +1,8 @@
## PathShagged ## URDE
**Status:** Extract Only **Status:** Extract Only
### Download ### Download
Precompiled builds are available at https://github.com/AxioDL/PathShagged/releases Precompiled builds are available at https://github.com/AxioDL/urde/releases
### Platform Support ### Platform Support
* Windows 7+ (64-bit support only) * Windows 7+ (64-bit support only)
@ -16,3 +16,57 @@ Precompiled builds are available at https://github.com/AxioDL/PathShagged/releas
* 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 builders)
* [Xcode Tools](https://developer.apple.com/xcode/download/) (Mac builders)
### 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
```
Windows 7/8 users should then run:
```sh
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Release ../urde
```
Windows 10 users should then run:
```sh
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_BUILD_TYPE=Release ../urde
```
Then open `urde.sln`
#### Xcode
```sh
git clone https://github.com/AxioDL/urde.git
mkdir urde-build
cd urde
git submodule update --init --recursive
cd ../urde-build
cmake -G Xcode -DCMAKE_BUILD_TYPE=Release ../urde
```
Then open `urde.xcodeproj`

3
Runtime/CToken.hpp
View File

@ -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;}
}; };
} }

2
hecl

@ -1 +1 @@
Subproject commit f17dcd4d03b87262594a89bdae2c8426c8b50978 Subproject commit 0df19b29fbc5024511d3bb444e9b9f7ef57d766d

2
nod

@ -1 +1 @@
Subproject commit 556a5868bb79d740d5cfd5eccd5135c2fd0f39c1 Subproject commit a98927d4a00926a04caca202a2da88763c08ac7c