From 0efd28abcc8998c1ac0c9503557c79a54f618658 Mon Sep 17 00:00:00 2001 From: Chris Ison Date: Tue, 25 Sep 2001 23:04:13 +0000 Subject: [PATCH] trying to get bootstrap to work in cygwin --- acinclude.m4 | 2 +- configure.ac | 6 ++++++ libs/audio/targets/Makefile.am | 4 ++-- libs/console/Makefile.am | 12 ++++++------ libs/models/Makefile.am | 10 +++++----- libs/video/renderer/Makefile.am | 8 ++++---- libs/video/targets/Makefile.am | 6 +++--- nq/source/Makefile.am | 34 ++++++++++++++++----------------- 8 files changed, 44 insertions(+), 38 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 25f6e48a1..04a003ebf 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -69,7 +69,7 @@ AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" + LIBS="$SDL_LIBS" dnl dnl Now check if the installed SDL is sufficiently new. (Also sanity dnl checks the results of sdl-config to some extent diff --git a/configure.ac b/configure.ac index 3c7329abe..62d991989 100644 --- a/configure.ac +++ b/configure.ac @@ -840,6 +840,7 @@ QF_maGiC_VALUE CD_PLUGIN_TARGETS="$CD_PLUGIN_TARGETS libcd_sgi.la" SGI_CD_LIBS="-lcdaudio -lmediad -lds" ) +AC_SUBST(SGI_CD_LIBS) AC_EGREP_CPP([QF_maGiC_VALUE], [ @@ -1165,6 +1166,11 @@ if test "x$GCC" = "xyes"; then # CFLAGS="$CFLAGS -Wall -pedantic" fi +AS="$CC" +ASFLAGS="$CFLAGS" +AC_SUBST(AS) +AC_SUBST(ASFLAGS) + dnl ================================================================== dnl Make sure we link against a working zlib dnl ================================================================== diff --git a/libs/audio/targets/Makefile.am b/libs/audio/targets/Makefile.am index e60b33816..db227d641 100644 --- a/libs/audio/targets/Makefile.am +++ b/libs/audio/targets/Makefile.am @@ -30,12 +30,12 @@ libsnd_output_sgi_la_SOURCES= snd_sgi.c libsnd_output_sgi.la: $(libsnd_output_sgi_la_OBJECTS) $(libsnd_output_sgi_la_DEPENDENCIES) $(LINK) -rpath $(pluginpath) $(libsnd_output_sgi_la_LDFLAGS) $(libsnd_output_sgi_la_OBJECTS) $(libsnd_output_sgi_la_LIBADD) $(LIBS) -libsnd_output_sun_la_LDFLAGS= -version-info 1:0:0 $(SUN_LIBS) +libsnd_output_sun_la_LDFLAGS= -version-info 1:0:0 libsnd_output_sun_la_SOURCES= snd_sun.c libsnd_output_sun.la: $(libsnd_output_sun_la_OBJECTS) $(libsnd_output_sun_la_DEPENDENCIES) $(LINK) -rpath $(pluginpath) $(libsnd_output_sun_la_LDFLAGS) $(libsnd_output_sun_la_OBJECTS) $(libsnd_output_sun_la_LIBADD) $(LIBS) -libsnd_output_win_la_LDFLAGS= -version-info 1:0:0 $(WIN_LIBS) +libsnd_output_win_la_LDFLAGS= -version-info 1:0:0 $(WINSND_LIBS) libsnd_output_win_la_SOURCES= snd_win.c libsnd_output_win.la: $(libsnd_output_win_la_OBJECTS) $(libsnd_output_win_la_DEPENDENCIES) $(LINK) -rpath $(pluginpath) $(libsnd_output_win_la_LDFLAGS) $(libsnd_output_win_la_OBJECTS) $(libsnd_output_win_la_LIBADD) $(LIBS) diff --git a/libs/console/Makefile.am b/libs/console/Makefile.am index a7b8b00c7..16fa689a6 100644 --- a/libs/console/Makefile.am +++ b/libs/console/Makefile.am @@ -5,23 +5,23 @@ pkglibdir = @PLUGINDIR@ lib_LTLIBRARIES = libQFconsole.la pkglib_LTLIBRARIES = libconsole_client.la libconsole_server.la -common_SOURCES = complete.c console.c inputline.c list.c -client_SOURCES = client.c -server_SOURCES = server.c +common_sources = complete.c console.c inputline.c list.c +client_sources = client.c +server_sources = server.c libQFconsole_la_LDFLAGS = -version-info 1:0:0 libQFconsole_la_LIBADD = -libQFconsole_la_SOURCES = $(common_SOURCES) +libQFconsole_la_SOURCES = $(common_sources) libQFconsole_la_DEPENDENCIES = libconsole_client_la_LDFLAGS = -version-info 1:0:0 libconsole_client_la_LIBADD = -libconsole_client_la_SOURCES = $(client_SOURCES) +libconsole_client_la_SOURCES = $(client_sources) libconsole_client_la_DEPENDENCIES = libconsole_server_la_LDFLAGS = -version-info 1:0:0 libconsole_server_la_LIBADD = $(CURSES_LIBS) -libconsole_server_la_SOURCES = $(server_SOURCES) +libconsole_server_la_SOURCES = $(server_sources) libconsole_server_la_DEPENDENCIES = LIBLIST = libQFconsole.la diff --git a/libs/models/Makefile.am b/libs/models/Makefile.am index db3ebc017..aae55f880 100644 --- a/libs/models/Makefile.am +++ b/libs/models/Makefile.am @@ -22,26 +22,26 @@ endif lib_LTLIBRARIES = libQFmodels.la $(MODELS_GL) $(MODELS_SW) $(MODELS_SW32) -models_SOURCES = clip_hull.c model.c +models_sources = clip_hull.c model.c libQFmodels_la_LDFLAGS = -version-info 1:0:0 libQFmodels_la_LIBADD = brush/libbrush.la -libQFmodels_la_SOURCES = $(models_SOURCES) +libQFmodels_la_SOURCES = $(models_sources) libQFmodels_la_DEPENDENCIES = brush/libbrush.la libQFmodels_gl_la_LDFLAGS = -version-info 1:0:0 libQFmodels_gl_la_LIBADD = alias/libalias_gl.la brush/libbrush_gl.la sprite/libsprite_gl.la -libQFmodels_gl_la_SOURCES = $(models_SOURCES) gl_model_fullbright.c +libQFmodels_gl_la_SOURCES = $(models_sources) gl_model_fullbright.c libQFmodels_gl_la_DEPENDENCIES = alias/libalias_gl.la brush/libbrush_gl.la sprite/libsprite_gl.la libQFmodels_sw_la_LDFLAGS = -version-info 1:0:0 libQFmodels_sw_la_LIBADD = alias/libalias_sw.la brush/libbrush_sw.la sprite/libsprite_sw.la -libQFmodels_sw_la_SOURCES = $(models_SOURCES) +libQFmodels_sw_la_SOURCES = $(models_sources) libQFmodels_sw_la_DEPENDENCIES = alias/libalias_sw.la brush/libbrush_sw.la sprite/libsprite_sw.la libQFmodels_sw32_la_LDFLAGS = -version-info 1:0:0 libQFmodels_sw32_la_LIBADD = alias/libalias_sw32.la brush/libbrush_sw32.la sprite/libsprite_sw32.la -libQFmodels_sw32_la_SOURCES = $(models_SOURCES) +libQFmodels_sw32_la_SOURCES = $(models_sources) libQFmodels_sw32_la_DEPENDENCIES = alias/libalias_sw32.la brush/libbrush_sw32.la sprite/libsprite_sw32.la LIBLIST = libQFmodels.la libQFmodels_gl.la libQFmodels_sw.la libQFmodels_sw32.la diff --git a/libs/video/renderer/Makefile.am b/libs/video/renderer/Makefile.am index 579943ca7..388646c5f 100644 --- a/libs/video/renderer/Makefile.am +++ b/libs/video/renderer/Makefile.am @@ -21,22 +21,22 @@ endif lib_LTLIBRARIES = $(RENDERER_GL) $(RENDERER_SW) $(RENDERER_SW32) -common_SOURCES = r_cvar.c r_efrag.c r_ent.c r_graph.c r_light.c r_main.c \ +common_sources = r_cvar.c r_efrag.c r_ent.c r_graph.c r_light.c r_main.c \ r_part.c libQFrenderer_gl_la_LDFLAGS = -version-info 1:0:0 libQFrenderer_gl_la_LIBADD = gl/libgl.la -libQFrenderer_gl_la_SOURCES = $(common_SOURCES) +libQFrenderer_gl_la_SOURCES = $(common_sources) libQFrenderer_gl_la_DEPENDENCIES = gl/libgl.la libQFrenderer_sw_la_LDFLAGS = -version-info 1:0:0 libQFrenderer_sw_la_LIBADD = sw/libsw.la -libQFrenderer_sw_la_SOURCES = $(common_SOURCES) +libQFrenderer_sw_la_SOURCES = $(common_sources) libQFrenderer_sw_la_DEPENDENCIES = sw/libsw.la libQFrenderer_sw32_la_LDFLAGS = -version-info 1:0:0 libQFrenderer_sw32_la_LIBADD = sw32/libsw32.la -libQFrenderer_sw32_la_SOURCES = $(common_SOURCES) +libQFrenderer_sw32_la_SOURCES = $(common_sources) libQFrenderer_sw32_la_DEPENDENCIES = sw32/libsw32.la LIBLIST = libQFrenderer_gl.la libQFrenderer_sw.la libQFrenderer_sw32.la diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am index a941bf4ab..c600bbf32 100644 --- a/libs/video/targets/Makefile.am +++ b/libs/video/targets/Makefile.am @@ -16,13 +16,13 @@ libQFjs_la_LDFLAGS= -version-info 1:0:0 if JOYTYPE_LINUX libQFjs_la_SOURCES= joy.c joy_linux.c -endif +else if JOYTYPE_WIN32 libQFjs_la_SOURCES= joy.c joy_win.c -endif -if JOYTYPE_NULL +else libQFjs_la_SOURCES= joy.c joy_null.c endif +endif libQFjs_la_CFLAGS= $(JOY_CFLAGS) libQFjs.la: $(libQFjs_la_OBJECTS) $(libQFjs_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libQFjs_la_LDFLAGS) $(libQFjs_la_OBJECTS) $(libQFjs_la_LIBADD) $(LIBS) diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am index 9fef787c8..d19e1d180 100644 --- a/nq/source/Makefile.am +++ b/nq/source/Makefile.am @@ -45,7 +45,7 @@ endif noinst_LTLIBRARIES= libqfnet.la libasm.la -common_SOURCES= game.c host_skin.c skin.c world.c com.c +common_sources= game.c host_skin.c skin.c world.c com.c common_ldflags= -export-dynamic @@ -69,15 +69,15 @@ client_LIBFILES= \ client_LIBS= $(client_LIBFILES) libasm.la libqfnet.la $(NET_LIBS) client_LIB_DEPS=$(client_LIBFILES) libasm.la libqfnet.la -client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_screen.c \ +client_sources= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_screen.c \ cl_parse.c cl_tent.c cl_view.c \ console.c locs.c sbar.c -server_SOURCES= host.c host_cmd.c pr_cmds.c sv_cvar.c sv_main.c \ +server_sources= host.c host_cmd.c pr_cmds.c sv_cvar.c sv_main.c \ sv_move.c sv_phys.c sv_progs.c sv_user.c -combined_SOURCES= \ - $(common_SOURCES) $(client_SOURCES) $(server_SOURCES) +combined_sources= \ + $(common_sources) $(client_sources) $(server_sources) # Software-rendering targets @@ -86,7 +86,7 @@ soft_QFLIBS= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_sw.a \ $(top_builddir)/libs/models/libQFmodels_sw.la # ... Linux FBDev -nq_fbdev_SOURCES= $(combined_SOURCES) sys_unix.c +nq_fbdev_SOURCES= $(combined_sources) sys_unix.c nq_fbdev_LDADD= $(soft_QFLIBS) \ $(top_builddir)/libs/video/targets/libQFfbdev.la \ $(client_LIBS) @@ -96,7 +96,7 @@ nq_fbdev_DEPENDENCIES= $(soft_QFLIBS) \ $(client_LIB_DEPS) # ... SciTech MGL -nq_mgl_SOURCES= $(combined_SOURCES) sys_win.c +nq_mgl_SOURCES= $(combined_sources) sys_win.c nq_mgl_LDADD= $(soft_QFLIBS) \ $(top_builddir)/libs/video/targets/libQFmgl.la \ $(client_LIBS) $(MGL_LIBS) @@ -106,7 +106,7 @@ nq_mgl_DEPENDENCIES= $(soft_QFLIBS) \ $(client_LIB_DEPS) # ... SDL, version 1.2 and higher -nq_sdl_SOURCES= $(combined_SOURCES) sys_sdl.c +nq_sdl_SOURCES= $(combined_sources) sys_sdl.c nq_sdl_LDADD= $(soft_QFLIBS) \ $(top_builddir)/libs/video/targets/libQFsdl.la \ $(client_LIBS) $(SDL_LIBS) @@ -116,7 +116,7 @@ nq_sdl_DEPENDENCIES= $(soft_QFLIBS) \ $(client_LIB_DEPS) # ... 32-bit software, SDL -nq_sdl32_SOURCES= $(combined_SOURCES) sys_sdl.c +nq_sdl32_SOURCES= $(combined_sources) sys_sdl.c nq_sdl32_LDADD= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_sw32.a \ $(top_builddir)/libs/models/libQFmodels_sw32.la \ $(top_builddir)/libs/video/targets/libQFsdl32.la \ @@ -128,7 +128,7 @@ nq_sdl32_DEPENDENCIES= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_s $(client_LIB_DEPS) # ... Linux SVGAlib -nq_svga_SOURCES= $(combined_SOURCES) sys_unix.c +nq_svga_SOURCES= $(combined_sources) sys_unix.c nq_svga_LDADD= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_sw.a \ $(top_builddir)/libs/models/libQFmodels_sw.la \ $(top_builddir)/libs/video/targets/libQFsvga.la \ @@ -140,7 +140,7 @@ nq_svga_DEPENDENCIES= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_sw $(client_LIB_DEPS) # ... X11 -nq_x11_SOURCES= $(combined_SOURCES) sys_unix.c +nq_x11_SOURCES= $(combined_sources) sys_unix.c nq_x11_LDADD= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_sw.a \ $(top_builddir)/libs/models/libQFmodels_sw.la \ $(top_builddir)/libs/video/targets/libQFx11.la \ @@ -155,7 +155,7 @@ nq_x11_DEPENDENCIES= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_sw. # OpenGL-using targets # ... 3Dfx Voodoo 1 and 2 SVGAlib-based console GL -nq_3dfx_SOURCES= $(combined_SOURCES) sys_unix.c +nq_3dfx_SOURCES= $(combined_sources) sys_unix.c nq_3dfx_LDADD= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \ $(top_builddir)/libs/models/libQFmodels_gl.la \ $(top_builddir)/libs/video/targets/libQFtdfx.la \ @@ -168,7 +168,7 @@ nq_3dfx_DEPENDENCIES= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \ $(client_LIB_DEPS) # ... OpenGL in X Window -nq_glx_SOURCES= $(combined_SOURCES) sys_unix.c +nq_glx_SOURCES= $(combined_sources) sys_unix.c nq_glx_LDADD= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \ $(top_builddir)/libs/models/libQFmodels_gl.la \ $(top_builddir)/libs/video/targets/libQFglx.la \ @@ -182,7 +182,7 @@ nq_glx_DEPENDENCIES= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \ $(client_LIB_DEPS) # ... Simple Directmedia Layer, version 1.2 and higher, in GL mode -nq_sgl_SOURCES= $(combined_SOURCES) sys_sdl.c +nq_sgl_SOURCES= $(combined_sources) sys_sdl.c nq_sgl_LDADD= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \ $(top_builddir)/libs/models/libQFmodels_gl.la \ $(top_builddir)/libs/video/targets/libQFsgl.la \ @@ -195,7 +195,7 @@ nq_sgl_DEPENDENCIES= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \ $(client_LIB_DEPS) # ... SGI/Microsoft WGL (Windows OpenGL) -nq_wgl_SOURCES= $(combined_SOURCES) conproc.c sys_win.c +nq_wgl_SOURCES= $(combined_sources) conproc.c sys_win.c nq_wgl_LDADD= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \ $(top_builddir)/libs/models/libQFmodels_gl.la \ $(top_builddir)/libs/video/targets/libQFwgl.la \ @@ -207,9 +207,9 @@ nq_wgl_DEPENDENCIES= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \ $(client_LIB_DEPS) # Dedicated Server -ded_SOURCES= sys_unixd.c sv_ded.c +ded_sources= sys_unixd.c sv_ded.c -nq_server_SOURCES= $(common_SOURCES) $(server_SOURCES) $(ded_SOURCES) +nq_server_sources= $(common_sources) $(server_sources) $(ded_sources) nq_server_LDADD= libqfnet.la libasm.la nq_server_DEPENDENCIES= libqfnet.la libasm.la