Skip to content

Commit cc6e16f

Browse files
committed
updated install instructions in qorbook, premake added debugdir
1 parent cb404e2 commit cc6e16f

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

QorBook.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ NOTE: this process will become easier in future Qor versions
1010

1111
- Install [premake5](http://premake.github.io/download.html) and put it somewhere in your PATH
1212

13-
- Initialize the kit submodule and checkout the master branch:
13+
- Clone Qor master branch and init the submodules:
1414

1515
```
1616
git clone http://github.com/flipcoder/qor
@@ -26,6 +26,8 @@ git submodule foreach --recursive git pull origin master
2626

2727
- Run all the installers included (use the default paths) and put the msvc and gtkmm folder into C:\.
2828

29+
- Install python 2.7 32-bit and use the default install location.
30+
2931
- Edit this file (as admin) C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.10.25017\includemutex. On the line that says “unique_lock(_Mutex& _Mtx, const xtime *_Abs_time)” change xtime to ::xtime. On line that says “bool try_lock_until(const xtime *_Abs_time)” change xtime to ::xtime.
3032

3133
- Put C:\msvc\bin32 in your User PATH environment variable.
@@ -48,18 +50,16 @@ bin/
4850
profiles/
4951
default.json
5052
data/
51-
mods/
52-
(project name)/
53-
data/
5453
settings.json
5554
settings.schema.json
5655
src/
57-
Qor/ (symlink to Qor's src folder)
5856
Main.cpp
5957
Info.h
6058
MyState.h
6159
MyState.cpp
62-
premake4.lua
60+
lib/
61+
Qor
62+
premake5.lua
6363
```
6464

6565
#### Submodule explanation
@@ -88,8 +88,8 @@ C++:
8888
#include "MyState.h"
8989
#include "Info.h"
9090
#include "Qor/Qor.h"
91-
#include "Qor/kit/args/args.h"
92-
#include "Qor/kit/kit.h"
91+
#include "kit/args/args.h"
92+
#include "kit/kit.h"
9393
9494
int main(int argc, const char** argv)
9595
{

premake5.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
workspace("qor")
22
targetdir("bin")
3+
debugdir("bin")
34

45
configurations {"Debug", "Release"}
56

6-
defines { "GLM_FORCE_RADIANS" }
7+
defines { "GLM_FORCE_RADIANS", "NOMINMAX" }
78

89
-- Debug Config
910
configuration "Debug"

0 commit comments

Comments
 (0)