Personal/GPURayTracer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add ComputeLibrary as a submodule for easier building

Browse Source
This commit is contained in:
DawidPietrykowski 2021-08-11 16:58:00 +02:00
parent e9261a1929
commit 2d8349b737
8 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -11,4 +11,5 @@ packages
bin bin
obj obj
build build
makeP.bat old
*user.bat

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "ComputeEngine"]
path = ComputeEngine
url = https://github.com/DawidPietrykowski/ComputeEngine

1
ComputeEngine Submodule

@ -0,0 +1 @@
Subproject commit c89dda21e209cd8284d44f27a666aeab2c3db096

16
README.md
View File

@ -10,17 +10,19 @@ GPU Ray Tracing application based on my OpenGL Compute Engine.
* GLFW * GLFW
* GLEW * GLEW
* [stb_image](https://github.com/nothings/stb) * [stb_image](https://github.com/nothings/stb)
* [OpenGL Compute Engine](https://github.com/DawidPietrykowski/ComputeEngine)
## Build ## Build
Specify these root directories for dependencies in [make.bat](make.bat) script: * Clone this directory
* GLFW_ROOT * Run git submodule init
* GLEW_ROOT * Run git submodule update
* stb_image_ROOT * Specify these root directories for dependencies in [make_all.bat](make_all.bat) script:
* ComputeEngine_ROOT * GLFW_ROOT
* GLEW_ROOT
* stb_image_ROOT
Run [make.bat](make.bat) script. * Run [make_all.bat](make_all.bat).
* Run [build.bat](build.bat).
## Config files ## Config files

8
build.bat Normal file
View File

@ -0,0 +1,8 @@
@echo off
set GLFW_ROOT=
set GLEW_ROOT=
set stb_image_ROOT=
set ComputeEngine_ROOT=%CD%/ComputeEngine
cmake --build build --config Release

8
make.bat
View File

@ -1,8 +0,0 @@
@echo off
set GLFW_ROOT=
set GLEW_ROOT=
set stb_image_ROOT=
set ComputeEngine_ROOT=
cmake -B build -S . -DGLFW_ROOT=%GLFW_ROOT% -DGLEW_ROOT=%GLEW_ROOT% -Dstb_image_ROOT=%stb_image_ROOT% -DComputeEngine_ROOT=%ComputeEngine_ROOT%

10
make_all.bat Normal file
View File

@ -0,0 +1,10 @@
@echo off
set GLFW_ROOT=
set GLEW_ROOT=
set stb_image_ROOT=
set ComputeEngine_ROOT=%CD%/ComputeEngine
cmake -B ComputeEngine/build -S ComputeEngine -DGLFW_ROOT=%GLFW_ROOT% -DGLEW_ROOT=%GLEW_ROOT% -Dstb_image_ROOT=%stb_image_ROOT%
cmake --build ComputeEngine/build --config Release
cmake -B build -S . -DGLFW_ROOT=%GLFW_ROOT% -DGLEW_ROOT=%GLEW_ROOT% -Dstb_image_ROOT=%stb_image_ROOT% -DComputeEngine_ROOT=%ComputeEngine_ROOT%

2
remake.bat
View File

@ -1,2 +0,0 @@
rmdir /s /q build
make.bat