Ver código fonte

Build: Updated bsf version in order to fix linking issues on Linux

BearishSun 7 anos atrás
pai
commit
eb26c723ba
2 arquivos alterados com 6 adições e 6 exclusões
  1. 5 5
      Documentation/GitHub/compiling.md
  2. 1 1
      Source/bsf

+ 5 - 5
Documentation/GitHub/compiling.md

@@ -9,10 +9,10 @@ Use the guide below to get Banshee up and running as quickly as possible. Scroll
   - See [here](#otherDeps)
   - See [here](#otherDeps)
 - Run the following commands in the terminal/command line:
 - Run the following commands in the terminal/command line:
   - `git clone https://github.com/BearishSun/BansheeEngine.git`
   - `git clone https://github.com/BearishSun/BansheeEngine.git`
-  - `mkdir BansheeBuild`
-    - Note the build folder must be *OUTSIDE* of Banshee's root folder
-  - `cd BansheeBuild`
-  - `cmake -G "$generator$" ../BansheeEngine`
+  - `cd BansheeEngine`
+  - `mkdir Build`
+  - `cd Build`
+  - `cmake -G "$generator$" ../`
     - Where *$generator$* should be replaced with any of the supported generators. Some common ones:
     - Where *$generator$* should be replaced with any of the supported generators. Some common ones:
 	  - `Visual Studio 14 2015 Win64` - Visual Studio 2015 (64-bit build)
 	  - `Visual Studio 14 2015 Win64` - Visual Studio 2015 (64-bit build)
 	  - `Visual Studio 15 2017 Win64` - Visual Studio 2017 (64-bit build)
 	  - `Visual Studio 15 2017 Win64` - Visual Studio 2017 (64-bit build)
@@ -21,7 +21,7 @@ Use the guide below to get Banshee up and running as quickly as possible. Scroll
 	  - `Xcode`
 	  - `Xcode`
 	- See all valid generators: [cmake-generators](https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html)
 	- See all valid generators: [cmake-generators](https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html)
 - Build the project using your chosen tool
 - Build the project using your chosen tool
-  - Build files will be placed in `BansheeBuild` folder (e.g. Visual Studio or XCode solution, Makefiles)
+  - Build files will be placed in `BansheeEngine/Build` folder (e.g. Visual Studio or XCode solution, Makefiles)
 - Run the editor
 - Run the editor
   - Editor executable and libraries will be placed in `BansheeEngine/bin` folder
   - Editor executable and libraries will be placed in `BansheeEngine/bin` folder
 	 
 	 

+ 1 - 1
Source/bsf

@@ -1 +1 @@
-Subproject commit 6a992b4a42f943b759d896fdd018436491ba66be
+Subproject commit 5acdb49229d77c0b8e82a11aea03fa3cb88ce044