Fix compilation mistake
- Tweak makefiles to recurse source directories - Add missing include in mainmaster
parent
8023b65dc1
commit
56678b74b4
7
Makefile
7
Makefile
|
@ -1,4 +1,5 @@
|
||||||
SRC_FILES = $(wildcard *.c) $(wildcard obj/*.c) $(wildcard utilities/*.c)
|
SRC_DIRECTORY= ./ ./obj ./screens ./utilities
|
||||||
|
SRC_FILES = $(foreach dir, $(SRC_DIRECTORY), $(wildcard $(dir)/*.c))
|
||||||
EXE = main
|
EXE = main
|
||||||
BUILD_DIR = build/
|
BUILD_DIR = build/
|
||||||
OBJ = $(patsubst %.c,$(BUILD_DIR)%.o,$(SRC_FILES))
|
OBJ = $(patsubst %.c,$(BUILD_DIR)%.o,$(SRC_FILES))
|
||||||
|
@ -22,9 +23,7 @@ $(EXE): $(OBJ)
|
||||||
$(CC) -o $@ $^ $(LDFLAGS)
|
$(CC) -o $@ $^ $(LDFLAGS)
|
||||||
|
|
||||||
$(BUILD_DIR)%.o: %.c
|
$(BUILD_DIR)%.o: %.c
|
||||||
@ mkdir -p $(BUILD_DIR)
|
@ $(foreach dir, $(SRC_DIRECTORY), mkdir -p $(BUILD_DIR)/$(dir))
|
||||||
@ mkdir -p $(BUILD_DIR)/obj
|
|
||||||
@ mkdir -p $(BUILD_DIR)/utilities
|
|
||||||
@ $(CC) $(CFLAGS) -o $@ -c $<
|
@ $(CC) $(CFLAGS) -o $@ -c $<
|
||||||
|
|
||||||
-include $(DEP)
|
-include $(DEP)
|
||||||
|
|
3
main.c
3
main.c
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
#include "header.h"
|
#include "header.h"
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
struct kinematic_obj_node *kinematic_HEAD = NULL;
|
struct kinematic_obj_node *kinematic_HEAD = NULL;
|
||||||
|
@ -216,4 +217,4 @@ void play_test_level(Camera2D camera){
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue