Skip to content

Commit

Permalink
fized glad dependency | improved README_building.md | clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
durryx committed Oct 19, 2022
1 parent 0d65934 commit 1238a86
Show file tree
Hide file tree
Showing 13 changed files with 170 additions and 1,211 deletions.
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ cmake-build-*/
conan-cache/

# other
include/glad
#!include/glad/include
include/glad/*
!include/glad/CMakeLists.txt
#!include/glad/src
include/glfw
include/imgui
Expand All @@ -22,7 +22,7 @@ _deps/
*.bkp
DartConfiguration.tcl
imgui.ini
.*CMakeCache.txt.*
.*CMakeCache.txt
CMakePresets.json


Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# fraktals

images
![Alt Text](preview.gif)

## About fraktals

fraktals is an efficient fractals explorer program. It provides
* browsing feature
* step-by-step fractal algorithm operations
* procedural and parallel computation
<---* step back & fast foward --->
<---* +30 2D and 3D fractals --->
<---* save to image or gif --->
<!-- * step back & fast foward -->
<!-- * +30 2D and 3D fractals -->
<!-- * save to image or gif -->

## Getting Started

Expand Down
30 changes: 13 additions & 17 deletions README_building.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,35 +55,31 @@ A full build has different steps:
To configure the project, use `cmake` or `cmake-gui`.

#### (2.a) Configuring via cmake:
With Cmake directly:
```
cmake -S . -B ./build
```
Cmake will automatically create the `./build` folder if it does not exist, and it wil configure the project.

TODO

#### (2.b) Configuring via cmake-gui:

Open the GUI in the root folder:
Open the GUI in the project root folder:

```
cmake-gui .
```
Set the build directory:

![build_dir](https://user-images.githubusercontent.com/16418197/82524586-fa48e380-9af4-11ea-8514-4e18a063d8eb.jpg)

Configure the generator (set the various flags to your needs):
Set the build directory to `out`, disable warnings-as-errors and generate. For further debugging set the sanitizers, same goes for optimization.

![generate](https://user-images.githubusercontent.com/16418197/82781591-c97feb80-9e1f-11ea-86c8-f2748b96f516.png)

Generate:

![generate](https://user-images.githubusercontent.com/16418197/82781591-c97feb80-9e1f-11ea-86c8-f2748b96f516.png)
![build_dir](cmake-gui.png)


### (3) Build the project
Build the project for all targets:
```
cmake --build ./build
cmake --build out/build/unixlike-clang-debug/
```

or

```
TODO
```
### Editing and git directives
TODO
Binary file added cmake-gui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions include/glad/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
cmake_minimum_required(VERSION 3.0)
project(Glad)

add_library(
glad
./include/glad/glad.h
./src/glad.c
./include/KHR/khrplatform.h
)

target_include_directories(glad PUBLIC include)
Binary file added preview.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 1238a86

Please sign in to comment.