From 4c204573ed89092313060f6a956d4caaebc22cb9 Mon Sep 17 00:00:00 2001 From: Benny Date: Tue, 27 May 2014 17:19:38 -0400 Subject: [PATCH 1/5] Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index adb42ce..66bdf04 100644 --- a/README.md +++ b/README.md @@ -35,13 +35,15 @@ brew install cmake glew sdl2 assimp Open a Terminal and run: ```Shell # install dependencies + ./Unix-Build.sh [Build Target, Debug or Release (Optional)] [Any arguments for CMake (Optional)] + #For instance, you can use the CMake argument -G "Xcode" to generate an Xcode project during build, #or you can use -G "CodeBlocks - Unix Makefiles" to generate a CodeBlocks Project. #See http://www.cmake.org/ for more details about CMake arguments ``` -###Windows/MinGW### +###Windows### - Run "Windows-GenVisualStudioProject.bat" - Go to the build folder, and open 3DEngineCpp.sln with Visual Studio 2012 or newer (For older versions of Visual Studio, use manual build instructions) - Right click on the 3DEngineCpp project, and select "Set as start up project" @@ -79,3 +81,7 @@ cd build cmake -G "Visual Studio 12" ../ # open the generated SLN file (or cbp file if using CodeBlocks) and build! ``` +- Copy the DLLs in /lib/_bin/ to /build/Debug/ and /build/Release/ +- In Visual Studio, set the Startup project to 3DEngineCpp +- Move the res folder into the build folder +- Run From b62c38cc4385f7920bd0d32d4754ff1378eeff5d Mon Sep 17 00:00:00 2001 From: Benny Date: Tue, 27 May 2014 17:21:10 -0400 Subject: [PATCH 2/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 66bdf04..54a9e83 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ It's like the 3D Game Engine, except in C++ - [GLEW](http://glew.sourceforge.net/) - [SDL2](http://www.libsdl.org/) - [ASSIMP](http://assimp.sourceforge.net/) -- BUILD TOOLCHAIN +- BUILD TOOLCHAIN (Can be any one of the following, doesn't need to be all of them) - Linux - make, gcc, g++ ( Install with your package manager ) - [CodeBlocks](http://www.codeblocks.org/) From 15425d43ee5696c18f8104293ccac1e60b9e2726 Mon Sep 17 00:00:00 2001 From: Benny Date: Tue, 27 May 2014 17:24:43 -0400 Subject: [PATCH 3/5] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 54a9e83..bd8da29 100644 --- a/README.md +++ b/README.md @@ -85,3 +85,7 @@ cmake -G "Visual Studio 12" ../ - In Visual Studio, set the Startup project to 3DEngineCpp - Move the res folder into the build folder - Run + +##Additional Credits## +- mxaddict for setting up the awesome CMake build system +- Everyone who's created issues and pull requests! From c9a880426ffe528e74cf1e7b3744369f831a31b5 Mon Sep 17 00:00:00 2001 From: Benny Date: Tue, 27 May 2014 17:25:26 -0400 Subject: [PATCH 4/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd8da29..657aed0 100644 --- a/README.md +++ b/README.md @@ -88,4 +88,4 @@ cmake -G "Visual Studio 12" ../ ##Additional Credits## - mxaddict for setting up the awesome CMake build system -- Everyone who's created issues and pull requests! +- Everyone who's created or contributed to issues and pull requests, which make the project better! From 5ca8209ccca0c76b9dac286c2e4523585c93d1d7 Mon Sep 17 00:00:00 2001 From: Barry Deeney Date: Wed, 28 May 2014 06:01:48 +0800 Subject: [PATCH 5/5] Updated README to link to my github profile! :) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 657aed0..b9cba7c 100644 --- a/README.md +++ b/README.md @@ -87,5 +87,5 @@ cmake -G "Visual Studio 12" ../ - Run ##Additional Credits## -- mxaddict for setting up the awesome CMake build system +- [@mxaddict](https://github.com/mxaddict) for setting up the awesome CMake build system - Everyone who's created or contributed to issues and pull requests, which make the project better!