Skip to content

Commit

Permalink
Merge branch 'master' into indev
Browse files Browse the repository at this point in the history
  • Loading branch information
Kbz-8 authored Dec 20, 2023
2 parents b7424e7 + 1b49794 commit 6fb8932
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<div align="center">
<img src="./res/logo.png" alt="drawing" width="200"/>
<div align="center">
<a href="https://github.com/420verfl0w/MacroLibX/actions/workflows/linux_clang.yml"><img src="https://github.com/420verfl0w/MacroLibX/actions/workflows/linux_clang.yml/badge.svg"></a>
<a href="https://github.com/420verfl0w/MacroLibX/actions/workflows/linux_gcc.yml"><img src="https://github.com/420verfl0w/MacroLibX/actions/workflows/linux_gcc.yml/badge.svg"></a>
<a href="https://github.com/420verfl0w/MacroLibX/actions/workflows/macos_x86.yml"><img src="https://github.com/420verfl0w/MacroLibX/actions/workflows/macos_x86.yml/badge.svg"></a>
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/linux_clang.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/linux_clang.yml/badge.svg"></a>
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/linux_gcc.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/linux_gcc.yml/badge.svg"></a>
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/macos_x86.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/macos_x86.yml/badge.svg"></a>
</div>
<div align="center">
<a href="https://github.com/420verfl0w/MacroLibX/actions/workflows/windows.yml"><img src="https://github.com/420verfl0w/MacroLibX/actions/workflows/windows.yml/badge.svg"></a>
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/windows.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/windows.yml/badge.svg"></a>
</div>
</div>

Expand Down Expand Up @@ -71,7 +71,7 @@ To build on Windows you may need to use the [xmake](https://xmake.io) build. [He
### Clone and Build
Finally, you can clone the Git repository. When inside it, run the GNU `make` command to compile MacroLibX.
```bash
git clone https://github.com/420verfl0w/MacroLibX.git
git clone https://github.com/seekrs/MacroLibX.git
cd MacroLibX
make
```
Expand Down
8 changes: 4 additions & 4 deletions includes/mlx.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/10/04 16:56:35 by maldavid #+# #+# */
/* Updated: 2023/12/14 16:27:44 by maldavid ### ########.fr */
/* Updated: 2023/12/20 00:57:15 by kiroussa ### ########.fr */
/* */
/* ************************************************************************** */

// MacroLibX official repo https://github.com/420verfl0w/MacroLibX
// MacroLibX official repo https://github.com/seekrs/MacroLibX

#ifndef __MACRO_LIB_X_H__
#define __MACRO_LIB_X_H__
Expand Down Expand Up @@ -173,7 +173,7 @@ MLX_API void* mlx_new_image(void* mlx, int width, int height);
* /!\ If you run into glitches when writing or reading pixels from images /!\
* You need to add IMAGES_OPTIMIZED=false to your make mlx command
* ```
* ~ git clone https://github.com/420verfl0w/MacroLibX.git
* ~ git clone https://github.com/seekrs/MacroLibX.git
* ~ cd MacroLibX
* ~ make IMAGES_OPTIMIZED=false
* ```
Expand All @@ -194,7 +194,7 @@ MLX_API int mlx_get_image_pixel(void* mlx, void* img, int x, int y);
* /!\ If you run into glitches when writing or reading pixels from images /!\
* You need to add IMAGES_OPTIMIZED=false to your make mlx command
* ```
* ~ git clone https://github.com/420verfl0w/MacroLibX.git
* ~ git clone https://github.com/seekrs/MacroLibX.git
* ~ cd MacroLibX
* ~ make IMAGES_OPTIMIZED=false
* ```
Expand Down

0 comments on commit 6fb8932

Please sign in to comment.