From e02f72d31fd4a38a66e63e9a9d9e63cc74f2d0be Mon Sep 17 00:00:00 2001 From: "Alejandro V. Garcia" Date: Mon, 6 Sep 2010 19:36:31 +0000 Subject: [PATCH] exclude jpeglib from build git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5686 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/src/Makefile b/source/src/Makefile index a6a2b455..42c49ad9 100644 --- a/source/src/Makefile +++ b/source/src/Makefile @@ -20,13 +20,13 @@ ifneq (,$(findstring MINGW,$(PLATFORM))) WINDRES= windres CLIENT_INCLUDES= $(INCLUDES) -I../include # -lSDL_ttf -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 -lzdll -lopengl32 -lenet -lOpenAL32 -llibvorbisfile -llibintl -lws2_32 -lwinmm else USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi) override CXXFLAGS+= -rdynamic CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include # -lSDL_ttf -CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -ljpeg +CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile endif CLIENT_OBJS= \