4c9776fb96
instead of winmm being a part of GUI_LINK_OPTS_WIN32 only, it is placed in @DEVICE_LINE_OPTS@ so that it will be used for sdl, rfb, wx, etc. - solve compile problems when building bximage, niclist, and any other console based program. The compile flags returned by wx-config and sdl-config did strange things to these console programs, for example redefining main to SDL_main. Because I wanted to use the configure-generated CFLAGS to compile the programs, but I wanted to avoid including GUI specific compile options, I split up the configure's @CFLAGS@ variable into @CFLAGS@ and @GUI_CFLAGS@, and split @CXXFLAGS@ into @CXXFLAGS@ and @GUI_CXXFLAGS@. All programs in the Bochs binary will use both, but the console programs will just use @CFLAGS@ or @CXXFLAGS@. - gui/Makefile.in, I no longer use the gui specific CFLAGS variables, SDL_CFLAGS and WX_CXXFLAGS. These values are included in CFLAGS and CXXFLAGS now. - modified: configure.in, configure, all Makefile.in's
71 lines
1.6 KiB
Makefile
71 lines
1.6 KiB
Makefile
# Copyright (C) 2001 MandrakeSoft S.A.
|
|
#
|
|
# MandrakeSoft S.A.
|
|
# 43, rue d'Aboukir
|
|
# 75002 Paris - France
|
|
# http://www.linux-mandrake.com/
|
|
# http://www.mandrakesoft.com/
|
|
#
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2 of the License, or (at your option) any later version.
|
|
#
|
|
# This library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with this library; if not, write to the Free Software
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
|
|
|
@SUFFIX_LINE@
|
|
|
|
srcdir = @srcdir@
|
|
VPATH = @srcdir@
|
|
|
|
SHELL = /bin/sh
|
|
|
|
@SET_MAKE@
|
|
|
|
CXX = @CXX@
|
|
CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@
|
|
|
|
LDFLAGS = @LDFLAGS@
|
|
LIBS = @LIBS@
|
|
RANLIB = @RANLIB@
|
|
|
|
BX_INCDIRS = -I.. -I$(srcdir)/.. -I../@INSTRUMENT_DIR@ -I$(srcdir)/../@INSTRUMENT_DIR@
|
|
LOCAL_CXXFLAGS =
|
|
|
|
X86_OBJS = x86.o x86shim.o
|
|
X86_H = x86.h
|
|
|
|
SPARC_OBJS =
|
|
SPARC_H =
|
|
|
|
BX_DYNAMIC_OBJS = dynamic.o @AS_DYNAMIC_OBJS@
|
|
|
|
|
|
.@CPP_SUFFIX@.o:
|
|
$(CXX) @DASH@c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) @CXXFP@$< @OFP@$@
|
|
|
|
|
|
|
|
libdynamic.a: $(BX_DYNAMIC_OBJS)
|
|
@RMCOMMAND@ libdynamic.a
|
|
@MAKELIB@ $(BX_DYNAMIC_OBJS)
|
|
@RANLIB@ libdynamic.a
|
|
|
|
$(BX_DYNAMIC_OBJS): dynamic.h @AS_DYNAMIC_INCS@
|
|
|
|
clean:
|
|
@RMCOMMAND@ *.o
|
|
@RMCOMMAND@ *.a
|
|
|
|
dist-clean: clean
|
|
@RMCOMMAND@ Makefile
|