From f5591e75b24a7fce77cf4f8bc3f84e46a716a89a Mon Sep 17 00:00:00 2001 From: John Tsiombikas Date: Mon, 19 Dec 2022 05:57:45 +0200 Subject: [PATCH 1/1] fix include paths --- Makefile | 5 +++-- libs/ogg/Makefile | 2 +- libs/vorbis/Makefile | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 010e24e..159a119 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,9 @@ obj = $(src:.cpp=.o) $(csrc:.c=.o) opt = -O1 opt = -g -CXXFLAGS = -ansi -pedantic -Wall $(opt) -Isrc/3dengfx/src -MMD `sdl-config --cflags` -CFLAGS = -std=c89 -pedantic -Wall $(opt) -MMD `sdl-config --cflags` +incdir = -Isrc/3dengfx/src -Ilibs -Ilibs/png -Ilibs/jpeglib -Ilibs/ogg -Ilibs/vorbis +CXXFLAGS = -ansi -pedantic -Wall $(opt) $(incdir) -MMD `sdl-config --cflags` +CFLAGS = -std=c89 -pedantic -Wall $(opt) $(incdir) -MMD `sdl-config --cflags` libs = -Llibs src/3dengfx/lib3dengfx.a `sdl-config --libs` -lGL -lvorbis -logg \ -ljpeg -lpng -lz -l3ds diff --git a/libs/ogg/Makefile b/libs/ogg/Makefile index 352cef6..ef18894 100644 --- a/libs/ogg/Makefile +++ b/libs/ogg/Makefile @@ -2,7 +2,7 @@ obj = bitwise.o framing.o liba = ../libogg.a -CFLAGS = -O3 +CFLAGS = -O3 -I.. $(liba): $(obj) $(AR) rcs $@ $(obj) diff --git a/libs/vorbis/Makefile b/libs/vorbis/Makefile index a08455c..b47d697 100644 --- a/libs/vorbis/Makefile +++ b/libs/vorbis/Makefile @@ -4,7 +4,7 @@ obj = analysis.o bitrate.o block.o codebook.o envelope.o floor0.o floor1.o \ liba = ../libvorbis.a -CFLAGS = -O3 -I. +CFLAGS = -O3 -I. -I.. $(liba): $(obj) $(AR) rcs $@ $(obj) -- 1.7.10.4