From adec31317ad509fcfb86e2f4aa9d84e3174a5737 Mon Sep 17 00:00:00 2001
From: attilavs2 <whahou072@icloud.com>
Date: Fri, 28 Feb 2025 11:06:04 +0100
Subject: [PATCH] Revamp Makefile

---
 .gitignore |  2 ++
 Makefile   | 30 +++++++++++++++++++-----------
 src/ui.c   | 10 +++++-----
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index daba5a5..acb6566 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 build/
+build-win/
+build-tmp/
 raylib/
 *.amd64
 *.exe
diff --git a/Makefile b/Makefile
index 26dcab3..9cf7c7c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,7 @@ OUTNAME = mtycoon
 
 CFLAGS = -O0 -g -Wall -Wextra -I ./raylib/include -pipe
 #linux
-#LDFLAGS = -static -L./raylib/lib -lraylib -lm
-#windows
-LDFLAGS = -static -lraylib -lgdi32 -lwinmm -lm
+LDFLAGS = -L./raylib/lib -lraylib -lm
 
 CC = gcc
 OUTPUT = "${OUTNAME}.amd64"
@@ -12,30 +10,40 @@ OUTPUT = "${OUTNAME}.amd64"
 BUILD_DIR = build
 SRC_DIR = src
 
-OBJS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(wildcard $(SRC_DIR)/*.c))
+OBJS = $(patsubst $(SRC_DIR)/%.c,build-tmp/%.o,$(wildcard $(SRC_DIR)/*.c))
 
 all: | builddir build
-	${CC} ${CFLAGS} -o ${OUTPUT} ${OBJS} ${LDFLAGS}
+	${CC} ${CFLAGS} -o ${OUTPUT} ${wildcard $(BUILD_DIR)/*.o} ${LDFLAGS}
 
-$(BUILD_DIR)/%.o : $(SRC_DIR)/%.c
+windef:
+	$(eval OUTPUT = "$(OUTNAME).exe")
+	$(eval BUILD_DIR = build-win)
+	$(eval LDFLAGS = -static -lraylib -lgdi32 -lwinmm -lm)
+
+build-tmp/%.o : $(SRC_DIR)/%.c
 	${CC} -c $< -o $@ ${CFLAGS} 
 
 build: $(OBJS)
+	mv $(OBJS) $(BUILD_DIR)/
+	rm -rf build-tmp
 
 builddir:
 	- mkdir $(BUILD_DIR)
+	mkdir build-tmp
+	- mv $(wildcard $(BUILD_DIR)/*.o) build-tmp/
 
-win: | clean all
-	mv $(OUTPUT) "$(OUTNAME).exe"
-
+win: | windef all
+	
 testwin: win
-	./"$(OUTNAME).exe"
+	./$(OUTPUT)
 
 test: all
 	./${OUTPUT}
 
 clean:
 	- rm -rf ${BUILD_DIR}
-	- rm $(OUTPUT) "$(OUTNAME).exe"
+	- rm -rf build-win
+	- rm -rf build-tmp
+	- rm "$(OUTNAME).amd64" "$(OUTNAME).exe"
 
 .PHONY: all test clean win testwin prodwin
diff --git a/src/ui.c b/src/ui.c
index 2cd3fa1..2a2da9f 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -85,28 +85,28 @@ Widget main_menu = {
   .buttons = {
     {.box = {520,220,240,40},
      .color_0 = WHITE,
-     .color_1 = PINK,
+     .color_1 = BLACK,
      .color_txt = BLACK,
      .txt = "New game",
      .handler = main_menu_new_game 
     },
     {.box = {520,270,240,40},
      .color_0 = WHITE,
-     .color_1 = PINK,
+     .color_1 = BLACK,
      .color_txt = GRAY,
      .txt = "Load game",
      .handler = NULL  
     },
     {.box = {520,320,240,40},
      .color_0 = WHITE,
-     .color_1 = PINK,
+     .color_1 = BLACK,
      .color_txt = GRAY,
      .txt = "Settings",
      .handler = NULL  
     },
     {.box = {520,400,240,40},
      .color_0 = WHITE,
-     .color_1 = PINK,
+     .color_1 = BLACK,
      .color_txt = BLACK,
      .txt = "Exit",
      .handler = main_menu_exit  
@@ -127,7 +127,7 @@ void worker_widget_do_event(Widget *widget, Game *game, MTEvent event){
 Widget worker_widget = {
   .box = {.x = 40, .y = 40, .width = 300, .height = 600},
   .draw = worker_widget_draw,
-  .do_event = NULL,
+  .do_event = worker_widget_do_event,
   .capt_flags = CF_Mouse,
   .buttons = {