From 5363d0e7ba2418039e6dceb17df1f91a26010ce2 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 20 Mar 2022 23:49:26 +0300 Subject: [PATCH] Linux makefiles updated --- Debug/makefile | 1 + Debug/objects.mk | 2 +- Debug/sources.mk | 1 + Debug/src/audio/subdir.mk | 27 +++++++++++++++++++++++++++ Debug/src/graphics/subdir.mk | 3 +++ 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 Debug/src/audio/subdir.mk diff --git a/Debug/makefile b/Debug/makefile index cbc3aa03..9c5b3843 100644 --- a/Debug/makefile +++ b/Debug/makefile @@ -16,6 +16,7 @@ RM := rm -rf -include src/lighting/subdir.mk -include src/graphics/subdir.mk -include src/files/subdir.mk +-include src/audio/subdir.mk -include src/subdir.mk -include subdir.mk -include objects.mk diff --git a/Debug/objects.mk b/Debug/objects.mk index 471b1bf6..f076e108 100644 --- a/Debug/objects.mk +++ b/Debug/objects.mk @@ -4,5 +4,5 @@ USER_OBJS := -LIBS := -lglfw -lpng -lGL -lGLEW -lstdc++fs +LIBS := -lglfw -lpng -lopenal -lGL -lGLEW -lstdc++fs diff --git a/Debug/sources.mk b/Debug/sources.mk index fb65165d..b2849f80 100644 --- a/Debug/sources.mk +++ b/Debug/sources.mk @@ -24,6 +24,7 @@ CPP_DEPS := # Every subdirectory with source files must be described here SUBDIRS := \ src \ +src/audio \ src/files \ src/graphics \ src/lighting \ diff --git a/Debug/src/audio/subdir.mk b/Debug/src/audio/subdir.mk new file mode 100644 index 00000000..a12515df --- /dev/null +++ b/Debug/src/audio/subdir.mk @@ -0,0 +1,27 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + +# Add inputs and outputs from these tool invocations to the build variables +CPP_SRCS += \ +../src/audio/Audio.cpp \ +../src/audio/audioutil.cpp + +OBJS += \ +./src/audio/Audio.o \ +./src/audio/audioutil.o + +CPP_DEPS += \ +./src/audio/Audio.d \ +./src/audio/audioutil.d + + +# Each subdirectory must supply rules for building sources it contributes +src/audio/%.o: ../src/audio/%.cpp src/audio/subdir.mk + @echo 'Building file: $<' + @echo 'Invoking: Cross G++ Compiler' + g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" + @echo 'Finished building: $<' + @echo ' ' + + diff --git a/Debug/src/graphics/subdir.mk b/Debug/src/graphics/subdir.mk index db314574..0797e63c 100644 --- a/Debug/src/graphics/subdir.mk +++ b/Debug/src/graphics/subdir.mk @@ -5,6 +5,7 @@ # Add inputs and outputs from these tool invocations to the build variables CPP_SRCS += \ ../src/graphics/Batch2D.cpp \ +../src/graphics/Font.cpp \ ../src/graphics/LineBatch.cpp \ ../src/graphics/Mesh.cpp \ ../src/graphics/Shader.cpp \ @@ -13,6 +14,7 @@ CPP_SRCS += \ OBJS += \ ./src/graphics/Batch2D.o \ +./src/graphics/Font.o \ ./src/graphics/LineBatch.o \ ./src/graphics/Mesh.o \ ./src/graphics/Shader.o \ @@ -21,6 +23,7 @@ OBJS += \ CPP_DEPS += \ ./src/graphics/Batch2D.d \ +./src/graphics/Font.d \ ./src/graphics/LineBatch.d \ ./src/graphics/Mesh.d \ ./src/graphics/Shader.d \