--- np2/x11/Attic/Imakefile 2008/03/13 16:27:39 1.33 +++ np2/x11/Attic/Imakefile 2011/01/15 14:37:09 1.35 @@ -1,4 +1,4 @@ -XCOMM $Id: Imakefile,v 1.33 2008/03/13 16:27:39 monaka Exp $ +XCOMM $Id: Imakefile,v 1.35 2011/01/15 14:37:09 monaka Exp $ XCOMM XCOMM user config @@ -14,7 +14,7 @@ XCOMM #if defined(BIGENDIAN) CFLAGS+= -DWORDS_BIGENDIAN #endif - +CFLAGS+= $(MACHINE_ENDIAN_CFLAGS) XCOMM XCOMM GUI Toolkit @@ -40,12 +40,13 @@ XCOMM #if defined(USE_SDLAUDIO) || defined(USE_SDLMIXER) SOUND_DEFINE+= -DUSE_SDLAUDIO -SDL_CONFIG?= sdl-config +SDL_CONFIG?= pkg-config sdl SDL_INCLUDE= `$(SDL_CONFIG) --cflags` SDL_LIB= `$(SDL_CONFIG) --libs` #if defined(USE_SDLMIXER) CFLAGS+= -DUSE_SDLMIXER -SDL_LIB+= -lSDL_mixer +SDL_INCLUDE+= `pkg-config SDL_mixer --cflags` +SDL_LIB+= `pkg-config SDL_mixer --libs` #endif #endif @@ -53,9 +54,11 @@ SDL_LIB+= -lSDL_mixer CDEBUGFLAGS+= -fsigned-char SYSRESPATH?= $(LIBDIR)/xnp2 +NP2LOCALEDIR?= $(PROJECTROOT)/share/locale DEFINES= ShmDefines \ -DSYSRESPATH=\"$(SYSRESPATH)\" \ + -DNP2LOCALEDIR=\"$(NP2LOCALEDIR)\" \ $(SOUND_DEFINE) $(GTK_DEFINE) \ $(CPUFLAGS)