diff options
| author | Ray <raysan5@gmail.com> | 2017-03-07 08:45:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-07 08:45:53 +0100 |
| commit | 6e683d57e8209fc524c3cc25e75eff3fb33a1fbc (patch) | |
| tree | cf4ab9db7dc77f30bba3f3f2280c774fce4bdd7e | |
| parent | cb463a37ef1bc8c0cedd823dfeae0d53cfc57710 (diff) | |
| parent | c964559bc966292a7d70f00559ea80c224aab96d (diff) | |
| download | raylib-6e683d57e8209fc524c3cc25e75eff3fb33a1fbc.tar.gz raylib-6e683d57e8209fc524c3cc25e75eff3fb33a1fbc.zip | |
Merge pull request #240 from victorfisac/develop
Updated Physac and examples with last changes
| -rw-r--r-- | examples/physics_demo.c | 7 | ||||
| -rw-r--r-- | examples/physics_friction.c | 7 | ||||
| -rw-r--r-- | examples/physics_movement.c | 7 | ||||
| -rw-r--r-- | examples/physics_restitution.c | 7 | ||||
| -rw-r--r-- | examples/physics_shatter.c | 7 | ||||
| -rw-r--r-- | src/physac.h | 9 |
6 files changed, 33 insertions, 11 deletions
diff --git a/examples/physics_demo.c b/examples/physics_demo.c index de8d515e..b12ac708 100644 --- a/examples/physics_demo.c +++ b/examples/physics_demo.c @@ -3,9 +3,12 @@ * Physac - Physics demo * * NOTE: Physac requires multi-threading, when InitPhysics() a second thread is created to manage physics calculations. -* The file pthreadGC2.dll is required to run the program; you can find it in 'src\external' * -* Copyright (c) 2016 Victor Fisac +* Use the following code to compile (-static -lpthread): +* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib_icon -static -lraylib -lpthread +* -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition +* +* Copyright (c) 2017 Victor Fisac * ********************************************************************************************/ diff --git a/examples/physics_friction.c b/examples/physics_friction.c index a4baad53..db1b5f4c 100644 --- a/examples/physics_friction.c +++ b/examples/physics_friction.c @@ -3,9 +3,12 @@ * Physac - Physics friction * * NOTE: Physac requires multi-threading, when InitPhysics() a second thread is created to manage physics calculations. -* The file pthreadGC2.dll is required to run the program; you can find it in 'src\external' * -* Copyright (c) 2016 Victor Fisac +* Use the following code to compile (-static -lpthread): +* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib_icon -static -lraylib -lpthread +* -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition +* +* Copyright (c) 2017 Victor Fisac * ********************************************************************************************/ diff --git a/examples/physics_movement.c b/examples/physics_movement.c index ee97845f..3345404d 100644 --- a/examples/physics_movement.c +++ b/examples/physics_movement.c @@ -3,9 +3,12 @@ * Physac - Physics movement * * NOTE: Physac requires multi-threading, when InitPhysics() a second thread is created to manage physics calculations. -* The file pthreadGC2.dll is required to run the program; you can find it in 'src\external' * -* Copyright (c) 2016 Victor Fisac +* Use the following code to compile (-static -lpthread): +* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib_icon -static -lraylib -lpthread +* -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition +* +* Copyright (c) 2017 Victor Fisac * ********************************************************************************************/ diff --git a/examples/physics_restitution.c b/examples/physics_restitution.c index 378f6f24..534d125e 100644 --- a/examples/physics_restitution.c +++ b/examples/physics_restitution.c @@ -3,9 +3,12 @@ * Physac - Physics restitution * * NOTE: Physac requires multi-threading, when InitPhysics() a second thread is created to manage physics calculations. -* The file pthreadGC2.dll is required to run the program; you can find it in 'src\external' * -* Copyright (c) 2016 Victor Fisac +* Use the following code to compile (-static -lpthread): +* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib_icon -static -lraylib -lpthread +* -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition +* +* Copyright (c) 2017 Victor Fisac * ********************************************************************************************/ diff --git a/examples/physics_shatter.c b/examples/physics_shatter.c index 637a163e..fac90714 100644 --- a/examples/physics_shatter.c +++ b/examples/physics_shatter.c @@ -3,9 +3,12 @@ * Physac - Body shatter * * NOTE: Physac requires multi-threading, when InitPhysics() a second thread is created to manage physics calculations. -* The file pthreadGC2.dll is required to run the program; you can find it in 'src\external' * -* Copyright (c) 2016 Victor Fisac +* Use the following code to compile (-static -lpthread): +* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib_icon -static -lraylib -lpthread +* -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition +* +* Copyright (c) 2017 Victor Fisac * ********************************************************************************************/ diff --git a/src/physac.h b/src/physac.h index a6b529bc..ff56615d 100644 --- a/src/physac.h +++ b/src/physac.h @@ -38,13 +38,20 @@ * You can define your own malloc/free implementation replacing stdlib.h malloc()/free() functions. * Otherwise it will include stdlib.h and use the C standard library malloc()/free() function. * +* +* NOTE: Physac requires multi-threading, when InitPhysics() a second thread is created to manage physics calculations. +* +* Use the following code to compile (-static -lpthread): +* gcc -o $(NAME_PART).exe $(FILE_NAME) -s $(RAYLIB_DIR)\raylib\raylib_icon -static -lraylib -lpthread +* -lglfw3 -lopengl32 -lgdi32 -lopenal32 -lwinmm -std=c99 -Wl,--subsystem,windows -Wl,-allow-multiple-definition +* * VERY THANKS TO: * Ramón Santamaria (@raysan5) * * * LICENSE: zlib/libpng * -* Copyright (c) 2016 Victor Fisac +* Copyright (c) 2017 Victor Fisac * * This software is provided "as-is", without any express or implied warranty. In no event * will the authors be held liable for any damages arising from the use of this software. |
