Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Don't define CFLAGS anymore, export WZ_CFLAGS instead, which can be overridden by make commandlines 

- Set -DYY_NO_INPUT only in those places where needed
- Add some previously forgotten CFLAGS where needed
- Remove extranous -lintl from WIN32_LIBS
- Remove apparently unnecessary directory from Mac include (png_util doesn't need it either)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3986 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2008-03-10 02:01:46 +00:00
parent 2b482d299f
commit d8409c9819
13 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -50,7 +50,7 @@ case ${host_os} in
*mingw32*)
host_os_mingw32=yes
AC_CHECK_TOOL([WINDRES], [windres], AC_MSG_ERROR([windres not found]))
WIN32_LIBS='-lintl -ldbghelp -lshfolder -lwinmm -lwsock32'
WIN32_LIBS='-ldbghelp -lshfolder -lwinmm -lwsock32'
AC_SUBST([WIN32_LIBS], [${WIN32_LIBS}])
;;
*)
@ -238,8 +238,8 @@ WZ_CPPFLAGS="${WZ_CPPFLAGS} -DYY_NO_INPUT"
WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)"
CPPFLAGS="${CPPFLAGS} ${WZ_CPPFLAGS}"
CFLAGS="${CFLAGS} ${WZ_CFLAGS}"
AC_SUBST([WZ_CPPFLAGS], [${WZ_CPPFLAGS}])
AC_SUBST([WZ_CFLAGS], [${WZ_CFLAGS}])
AC_CONFIG_HEADER([config.h])

4
lib/framework/Makefile.am
View File

@ -4,6 +4,8 @@
%.lex.c:: %.l
$(LEX) $(LFLAGS) $(AM_LFLAGS) -o$@ $<
AM_CPPFLAGS = -DYY_NO_INPUT $(WZ_CPPFLAGS)
AM_CFLAGS = $(SDL_CFLAGS) $(WZ_CFLAGS)
AM_LFLAGS = $(FLEX_FLAGS)
AM_YFLAGS = -d
BUILT_SOURCES = resource_lexer.lex.c strres_lexer.lex.c resource_parser.tab.c strres_parser.tab.c resource_parser.tab.h strres_parser.tab.h
@ -19,5 +21,3 @@ libframework_a_SOURCES = SDL_framerate.c configfile.c debug.c exceptionhandler.c
frame.c frameresource.c input.c printf_ext.c resource_lexer.lex.c \
resource_parser.tab.c strnlen1.c strres.c strres_lexer.lex.c \
strres_parser.tab.c treap.c trig.c tagfile.c
libframework_a_CFLAGS = $(SDL_CFLAGS)

3
lib/gamelib/Makefile.am
View File

@ -4,6 +4,8 @@
%.lex.c:: %.l
$(LEX) $(LFLAGS) $(AM_LFLAGS) -o$@ $<
AM_CPPFLAGS = -DYY_NO_INPUT $(WZ_CPPFLAGS)
AM_CFLAGS = $(SDL_CFLAGS) $(WZ_CFLAGS)
AM_LFLAGS = $(FLEX_FLAGS)
AM_YFLAGS = -d
BUILT_SOURCES = audp_lexer.lex.c audp_parser.tab.c audp_parser.tab.h
@ -17,4 +19,3 @@ libgamelib_a_SOURCES = anim.c animobj.c audp_lexer.lex.c audp_parser.tab.c \
libgamelib_a_LIBADD = $(top_builddir)/lib/ivis_opengl/libivis_opengl.a \
$(top_builddir)/lib/ivis_common/libivis_common.a $(top_builddir)/lib/framework/libframework.a
libgamelib_a_CFLAGS = $(SDL_CFLAGS)

3
lib/ivis_common/Makefile.am
View File

@ -1,3 +1,5 @@
AM_CFLAGS = $(SDL_CFLAGS) $(PNG_CFLAGS) $(WZ_CFLAGS)
noinst_LIBRARIES = libivis_common.a
noinst_HEADERS = bitimage.h imd.h ivi.h ivisdef.h \
ivispatch.h pieblitfunc.h pieclip.h piedef.h piefunc.h piemode.h piepalette.h \
@ -7,4 +9,3 @@ libivis_common_a_SOURCES = bitimage.c imd.c imdload.c png_util.c pieclip.c \
piestate.c
libivis_common_a_LIBADD = $(top_builddir)/lib/framework/libframework.a
libivis_common_a_CFLAGS = $(SDL_CFLAGS)

4
lib/ivis_common/png_util.c
View File

@ -21,11 +21,7 @@
#include "lib/framework/frame.h"
#include "png_util.h"
#ifdef WZ_OS_MAC
#include <Png/png.h>
#else
#include <png.h>
#endif
#include <physfs.h>
#define PNG_BYTES_TO_CHECK 8

3
lib/ivis_opengl/Makefile.am
View File

@ -1,3 +1,5 @@
AM_CFLAGS = $(SDL_CFLAGS) $(PNG_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(WZ_CFLAGS)
noinst_LIBRARIES = libivis_opengl.a
noinst_HEADERS = piematrix.h screen.h
@ -7,4 +9,3 @@ libivis_opengl_a_SOURCES = ivi.c pieblitfunc.c piedraw.c piefunc.c \
libivis_opengl_a_LIBADD = $(top_builddir)/lib/ivis_common/libivis_common.a \
$(top_builddir)/lib/framework/libframework.a
libivis_opengl_a_CFLAGS = $(SDL_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS)

3
lib/netplay/Makefile.am
View File

@ -1,7 +1,8 @@
AM_CFLAGS = $(SDL_CFLAGS) $(SDL_NET_CFLAGS) $(WZ_CFLAGS)
noinst_LIBRARIES = libnetplay.a
noinst_HEADERS = netlog.h netplay.h nettypes.h
libnetplay_a_SOURCES = netjoin_stub.c netplay.c nettypes.c netlog.c
libnetplay_a_LIBADD = $(top_builddir)/lib/framework/libframework.a
libnetplay_a_CFLAGS = $(SDL_CFLAGS) $(SDL_NET_CFLAGS)

3
lib/script/Makefile.am
View File

@ -4,6 +4,8 @@
%.lex.c:: %.l
$(LEX) $(LFLAGS) $(AM_LFLAGS) -o$@ $<
AM_CPPFLAGS = -DYY_NO_INPUT $(WZ_CPPFLAGS)
AM_CFLAGS = $(SDL_CFLAGS) $(WZ_CFLAGS)
AM_LFLAGS = $(FLEX_FLAGS)
AM_YFLAGS = -d
BUILT_SOURCES = script_lexer.lex.c chat_lexer.lex.c script_parser.tab.c chat_parser.tab.c script_parser.tab.h chat_parser.tab.h
@ -17,4 +19,3 @@ libscript_a_SOURCES = script_lexer.lex.c script_parser.tab.c chat_lexer.lex.c \
chat_parser.tab.c codeprint.c event.c evntsave.c interp.c script.c stack.c
libscript_a_LIBADD = $(top_builddir)/lib/framework/libframework.a
libscript_a_CFLAGS = $(SDL_CFLAGS)

4
lib/sequence/Makefile.am
View File

@ -1,6 +1,6 @@
AM_CFLAGS = $(SDL_CFLAGS) $(WZ_CFLAGS)
noinst_LIBRARIES = libsequence.a
noinst_HEADERS = sequence.h
libsequence_a_SOURCES = sequence.c
libsequence_a_CFLAGS = $(SDL_CFLAGS)

3
lib/sound/Makefile.am
View File

@ -1,3 +1,5 @@
AM_CFLAGS = $(SDL_CFLAGS) $(OGGVORBIS_CFLAGS) $(OPENAL_CFLAGS) $(WZ_CFLAGS)
noinst_LIBRARIES = libsound.a
noinst_HEADERS = aud.h audio.h audio_id.h cdaudio.h mixer.h oggvorbis.h openal_error.h track.h tracklib.h
@ -5,4 +7,3 @@ libsound_a_SOURCES = audio.c audio_id.c cdaudio.c oggvorbis.c openal_error.c ope
libsound_a_LIBADD = $(top_builddir)/lib/gamelib/libgamelib.a \
$(top_builddir)/lib/framework/libframework.a
libsound_a_CFLAGS = $(SDL_CFLAGS) $(OGGVORBIS_CFLAGS) $(OPENAL_CFLAGS)

4
lib/sqlite3/Makefile.am
View File

@ -1,8 +1,6 @@
CFLAGS+= -Wno-missing-field-initializers
AM_CFLAGS = $(SDL_CFLAGS) $(WZ_CFLAGS) -Wno-missing-field-initializers
noinst_LIBRARIES = libsqlite3.a
noinst_HEADERS = physfs_vfs.h sqlite3ext.h sqlite3.h
libsqlite3_a_SOURCES = physfs_vfs.c sqlite3.c
libsqlite3_a_CFLAGS = $(SDL_CFLAGS)

3
lib/widget/Makefile.am
View File

@ -1,3 +1,5 @@
AM_CFLAGS = $(SDL_CFLAGS) $(WZ_CFLAGS)
noinst_LIBRARIES = libwidget.a
noinst_HEADERS = bar.h button.h editbox.h form.h label.h scrap.h slider.h tip.h \
widgbase.h widget.h widgint.h
@ -7,4 +9,3 @@ libwidget_a_SOURCES = bar.c button.c editbox.c form.c label.c scrap.c slider.c \
libwidget_a_LIBADD = $(top_builddir)/lib/ivis_opengl/libivis_opengl.a \
$(top_builddir)/lib/ivis_common/libivis_common.a $(top_builddir)/lib/framework/libframework.a
libwidget_a_CFLAGS = $(SDL_CFLAGS)

4
src/Makefile.am
View File

@ -4,6 +4,8 @@
%.lex.c:: %.l
$(LEX) $(LFLAGS) $(AM_LFLAGS) -o$@ $<
AM_CPPFLAGS = -DYY_NO_INPUT $(WZ_CPPFLAGS)
AM_CFLAGS = $(SDL_CFLAGS) $(SDL_NET_CFLAGS) $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(OGGVORBIS_CFLAGS) $(OPENAL_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(POPT_CFLAGS) $(WZ_CFLAGS)
AM_LFLAGS = $(FLEX_FLAGS)
AM_YFLAGS = -d
BUILT_SOURCES = level_lexer.lex.c scriptvals_lexer.lex.c scriptvals_parser.tab.c scriptvals_parser.tab.h
@ -48,8 +50,6 @@ warzone2100_SOURCES = scriptvals_parser.tab.c scriptvals_lexer.lex.c \
multiplay.c multistruct.c oprint.c power.c projectile.c seqdisp.c structure.c \
target.c version.c warzoneconfig.c
warzone2100_CFLAGS = $(SDL_CFLAGS) $(SDL_NET_CFLAGS) $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(OGGVORBIS_CFLAGS) $(OPENAL_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(POPT_CFLAGS)
warzone2100_LDADD = \
$(top_builddir)/lib/widget/libwidget.a \
$(top_builddir)/lib/sequence/libsequence.a \