From 5ca191d14f9a4fcef68020b9a9af061442978ad6 Mon Sep 17 00:00:00 2001 From: klemek Date: Tue, 3 Jun 2025 22:40:07 +0200 Subject: [PATCH] better gcc and types.h --- .gitignore | 1 - Makefile | 6 ++---- src/args.h | 13 +------------ src/bmp.h | 4 ++-- src/types.h | 18 ++++++++++++++++++ 5 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 src/types.h diff --git a/.gitignore b/.gitignore index 83e8663..29face3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ build -*.o .vscode *.bmp \ No newline at end of file diff --git a/Makefile b/Makefile index e9b423a..f89c9d3 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,5 @@ clean: rm -rf build build: - mkdir -p build && \ - cd build && \ - gcc -Wall -c ../src/*.c && \ - gcc -Wall -o mg *.o \ No newline at end of file + mkdir -p build + gcc -Wall src/*.c src/*.h -o build/mg \ No newline at end of file diff --git a/src/args.h b/src/args.h index 9fd8369..65563af 100644 --- a/src/args.h +++ b/src/args.h @@ -1,21 +1,10 @@ +#include "types.h" #include #include #ifndef ARGS_H #define ARGS_H -struct Parameters { - unsigned long width; - unsigned long height; - char *file_path; - unsigned int size; - float slope; - float start[3]; - float var[3]; -}; - -typedef struct Parameters parameters; - parameters parse_args(int argc, char **argv); #endif \ No newline at end of file diff --git a/src/bmp.h b/src/bmp.h index 034d813..4b8cff1 100644 --- a/src/bmp.h +++ b/src/bmp.h @@ -1,8 +1,8 @@ +#include "types.h" + #ifndef BMP_H #define BMP_H -typedef void line_fn(unsigned long y, char *data_buffer); - void bmp_generate(unsigned long width, unsigned long height, unsigned int color_depth, char *file_path, line_fn generate_line); diff --git a/src/types.h b/src/types.h new file mode 100644 index 0000000..fe7be35 --- /dev/null +++ b/src/types.h @@ -0,0 +1,18 @@ +#ifndef TYPES_H +#define TYPES_H + +struct Parameters { + unsigned long width; + unsigned long height; + char *file_path; + unsigned int size; + float slope; + float start[3]; + float var[3]; +}; + +typedef struct Parameters parameters; + +typedef void line_fn(unsigned long y, char *data_buffer); + +#endif \ No newline at end of file