Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Add] OpenAL to makefile. Preparing for Audio enginey thing.

Browse Source
This commit is contained in:
Allanis 2013-02-21 23:42:47 +00:00
parent 47430b1fe9
commit ab4d06a707
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bin/Makefile
View File

@ -14,8 +14,10 @@ CLUA = -I../lib/lua
CSDL = $(shell sdl-config --cflags) CSDL = $(shell sdl-config --cflags)
CXML = $(shell xml2-config --cflags) CXML = $(shell xml2-config --cflags)
CTTF = $(shell freetype-config --cflags) CTTF = $(shell freetype-config --cflags)
CAL = -lopenal
CVORBIS =
CGL = CGL =
CFLAGS = $(CLUA) $(CSDL) $(CXML) $(CTTF) $(CGL) $(VERSION) CFLAGS = $(CLUA) $(CSDL) $(CXML) $(CTTF) $(CGL) $(CAL) $(CVORBIS) $(VERSION)
ifdef DEBUG ifdef DEBUG
CFLAGS += -W -Wall -g3 -DDEBUG -DLUA_USE_APICHECK CFLAGS += -W -Wall -g3 -DDEBUG -DLUA_USE_APICHECK
else else
@ -23,19 +25,26 @@ CFLAGS += -O2 -funroll-loops
endif endif
LDLUA = ../lib/lua/liblua.a LDLUA = ../lib/lua/liblua.a
LDSDL = `sdl-config --libs` -lSDL_image LDSDL = $(shell sdl-config --libs) -lSDL_image
LDXML = `xml2-config --libs` LDXML = $(shell xml2-config --libs)
LDTTF = `freetype-config --libs` LDTTF = $(shell freetype-config --libs)
LDGL = -lGL LDGL = -lGL
LDAL = -lopenal
LDVORBIS = -lvorbisfile
LDPNG = -lpng LDPNG = -lpng
LDFLAGS = -lm $(LDLUA) $(LDSDL) $(LDXML) $(LDTTF) $(LDGL) $(LDPNG) LDFLAGS = -lm $(LDLUA) $(LDSDL) $(LDXML) $(LDTTF) $(LDGL) $(LDPNG) $(LDAL) $(LDVORBIS)
# This is just for gstat to run some analysis on performance.
ifdef DEBUG ifdef DEBUG
LDFLAGS += -pg LDFLAGS += -pg
endif endif
DATA_AI = $(shell find ../scripts/ai/ -name '*.lua')
DATA_GFX = $(shell find ../gfx/ -name '*.png')
DATA_XML = $(shell find ../dat/ -name '*.xml' -o -name '*.ttf')
DATA_SND = $(shell find ../snd/ -name '*.ogg')
DATA = data DATA = data
DATAFILES = $(VERSIONFILE) $(shell find ../scripts/ ../gfx/ ../dat/ -name '*.lua' -o -name '*.png' -o -name '*.xml' -o -name '*.ttf') DATAFILES = $(VERSIONFILE) $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND)
%.o: %.c %.h %.o: %.c %.h
@gcc -c $(CFLAGS) -o $@ $< @gcc -c $(CFLAGS) -o $@ $<

0
gfx/fonts/font.ttf → dat/font.ttf
View File

2
src/font.c
View File

@ -8,7 +8,7 @@
#include "log.h" #include "log.h"
#include "pack.h" #include "pack.h"
#define FONT_DEF "../gfx/fonts/font.ttf" #define FONT_DEF "../dat/font.ttf"
// == Font render routines.================================ // == Font render routines.================================
// Use a display list to store ASCII chars rendered with // Use a display list to store ASCII chars rendered with