Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
ravi688 committed Apr 20, 2024
2 parents 3114c42 + 680f506 commit e043cb8
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 15 deletions.
14 changes: 14 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ Linux-AMD-GPU:
stage: build
script:
- echo "Hello World"
- sudo apt-get update
- sudo apt-get install build-essential
- sudo apt-get install -y libz-dev
- sudo apt-get install -y libpng-dev
- sudo apt-get install -y libbrotli-dev
- sudo chmod +x ./ci-build.sh
- ./ci-build.sh
# reboot to windows
- sudo chmod +x ./switch-to-windows.sh
- ./switch-to-windows.sh
Expand All @@ -32,6 +39,13 @@ Linux-Intel-GPU:
stage: build
script:
- echo "Hello World"
- sudo apt-get update
- sudo apt-get install build-essential
- sudo apt-get install -y libz-dev
- sudo apt-get install -y libpng-dev
- sudo apt-get install -y libbrotli-dev
- sudo chmod +x ./ci-build.sh
- ./ci-build.sh
# reboot to windows
- sudo chmod +x ./switch-to-windows.sh
- ./switch-to-windows.sh
Expand Down
36 changes: 21 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,39 +55,39 @@ There are only C and C++ interface headers for now. <br>
4. **GNU Make 4.3**, you can check if it is already installed, though it already comes with mingw64 binutils package, by running

```
$make --version
$ make --version
```

If this isn't already installed, run the following in MSYS2 MinGW shell

```
$pacman -S make
$ pacman -S make
```

5. **Git version 2.35.1**, git must be installed in your machine, you can check if it is already installed by running <br>

```
$git --version
$ git --version
```

If this isn't already installed, run the following in MSYS2 MinGW shell

```
$pacman -S git
$ pacman -S git
```

6. **glslc**, glslc can be installed as follows, run the following in MSYS2 MinGW shell <br>

```
$pacman -S mingw-w64-x86_64-shaderc
$ pacman -S mingw-w64-x86_64-shaderc
```

### Requirements for building on Linux (Debian)

1. **Vulkan Tools**

```
$sudo apt-get install vulkan-tools
$ sudo apt-get install vulkan-tools
```

2. **Vulkan SDK**
Expand All @@ -101,48 +101,54 @@ There are only C and C++ interface headers for now. <br>
3. **GCC 11.2.0** (tested on this, but might also work with previous versions), you can check if it is already installed in your machine by running <br>

```
$gcc --version
$ gcc --version
```

OR

```
$g++ --version
$ g++ --version
```

If this isn't already installed, run the following in the terminal

```
$sudo apt-get install gcc
$ sudo apt-get install gcc
```
You might also need to install `build-essentials` in case you encounter any standar library header inclusion errors:
```
$sudo apt-get update
$sudo apt-get install build-essentials
$ sudo apt-get update
$ sudo apt-get install build-essentials
```

4. **GNU Make 4.3**, you can check if it is already installed, though it already comes with mingw64 binutils package, by running

```
$make --version
$ make --version
```

If this isn't already installed, run the following in the terminal

```
$sudo apt-get install make
$ sudo apt-get install make
```

5. **Git version 2.35.1**, git must be installed in your machine, you can check if it is already installed by running <br>

```
$git --version
$ git --version
```

If this isn't already installed, run the following in the terminal

```
$sudo apt-get install git
$ sudo apt-get install git
```
6. You might also need to install the followings:
```
$ sudo apt-get install libz-dev
$ sudo apt-get install libpng-dev
$ sudo apt-get install libbrotli-dev
```

### Runtime requirements
Expand Down
5 changes: 5 additions & 0 deletions ci-test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/bash

# This script would run tests for the renderer and check their return codes

echo "Hello World"
4 changes: 4 additions & 0 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,10 @@ ifeq ($(NOOPT),1)
LINKER_FLAGS += -O0
endif

ifeq ($(WALL),1)
COMPILER_FLAGS += -Wall
endif

DEBUG_COMPILER_FLAGS= -g #-fsanitize=integer-divide-by-zero // why it is not working on windows 64 bit?
DEBUG_LINKER_FLAGS= -g #-fsanitize=integer-divide-by-zero // why it is not working on windows 64 bit?

Expand Down

0 comments on commit e043cb8

Please sign in to comment.