kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

makefile updates

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4772 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2010-01-14 23:46:03 +00:00
parent 9de9c18cea
commit d42fd4eda2
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/codeblocks/AssaultCube.cbp
+1
View File
@@ -36,6 +36,7 @@
<Add option="-mwindows" />
<Add library="SDL" />
<Add library="SDL_image" />
<Add library="SDL_ttf" />
<Add library="zdll" />
<Add library="opengl32" />
<Add library="enet" />
source/src/Makefile
+3 -3
View File
@@ -18,11 +18,11 @@ MV=mv
ifneq (,$(findstring MINGW,$(PLATFORM)))
WINDRES= windres
CLIENT_INCLUDES= $(INCLUDES) -I../include
CLIENT_LIBS= -mwindows -L../lib -lSDL -lSDL_image -lzdll -lopengl32 -lenet -lOpenAL32 -llibvorbisfile -ljpeg -llibintl -lws2_32 -lwinmm
CLIENT_LIBS= -mwindows -L../lib -lSDL -lSDL_image -lSDL_ttf -lzdll -lopengl32 -lenet -lOpenAL32 -llibvorbisfile -ljpeg -llibintl -lws2_32 -lwinmm
else
override CXXFLAGS+= -rdynamic
CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
CLIENT_LIBS= -L../enet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -ljpeg
CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags` -idirafter ../include
CLIENT_LIBS= -L../enet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_ttf -lz -lGL -lopenal -lvorbisfile -ljpeg
endif
CLIENT_OBJS= \
source/src/rendertext.cpp
+3 -3
View File
@@ -140,8 +140,8 @@ void initfont()
TTF_Init();
int fsize = 64;
char *fonname = "packages\\misc\\font.ttf";
ttffont = TTF_OpenFont(findfile(fonname, "r"), fsize);
const char *fontname = "packages/misc/font.ttf";
ttffont = TTF_OpenFont(findfile(path(fontname, true), "r"), fsize);
utf8font.defaulth = 0;
utf8font.defaultw = 0;
@@ -670,7 +670,7 @@ void draw_text(const char *str, int left, int top, int r, int g, int b, int a, i
for(; next <= iter && next != end; )
{
int test = utf8::distance(next, iter);
//int test = utf8::distance(next, iter);
int c = utf8::peek_next(next, end);
if(next == cursoriter) { cx = x; cy = y; cc = c; }