There is no libgcc_r.a anymore.
This commit is contained in:
parent
51e9be548e
commit
a2a5360b80
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=38885
9 changed files with 11 additions and 11 deletions
|
@ -12,7 +12,7 @@
|
|||
|
||||
SMPEG_CFLAGS=""
|
||||
-SMPEG_LIBS="-lsmpeg"
|
||||
+SMPEG_LIBS="-lsmpeg -lgcc_r"
|
||||
+SMPEG_LIBS="-lsmpeg"
|
||||
|
||||
sed -e "s|@SDL_VERSION@|$SDL_VERSION|g" -e "s|@SDL_CFLAGS@|$SDL_CFLAGS|g" -e "s|@SDL_LIBS@|$SDL_LIBS|g" -e "s|@SMPEG_CFLAGS@|$SMPEG_CFLAGS|g" -e "s|@SMPEG_LIBS@|$SMPEG_LIBS|g" < Setup.pre.in > Setup.in
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
Mk4py.so: $(PYOBJS) libmk4.a
|
||||
- $(CXX) -o $@ $(CXX_SWITCHES) -shared $(SPYOBJS) $(SHLOBJS)
|
||||
+ $(CXX) -o $@ $(CXX_SWITCHES) -shared $(SPYOBJS) $(SHLOBJS) -lgcc_r
|
||||
+ $(CXX) -o $@ $(CXX_SWITCHES) -shared $(SPYOBJS) $(SHLOBJS)
|
||||
|
||||
demo: ../demos/demo.cpp libmk4.a
|
||||
$(LIBTOOL) --mode=link $(CXX) $(CXX_SWITCHES) -o $@ \
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
IMAGE = -lSDL_image
|
||||
-MIXER = -lSDL_mixer
|
||||
-SMPEG = -lsmpeg
|
||||
+MIXER = -lSDL_mixer -lgcc_r
|
||||
+SMPEG = -lsmpeg -lgcc_r
|
||||
+MIXER = -lSDL_mixer
|
||||
+SMPEG = -lsmpeg
|
||||
#--EndConfig
|
||||
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
-D$(CIBLE) -DDIR=\"$(DATADIR)\" -DVERSION=\"$(VERSION)\"
|
||||
- LIBS := $(shell sdl-config --libs) -lSDL_mixer -lm #-lSDL_image --static
|
||||
+ CFLAGS += $(CFLAGS_)
|
||||
+ LIBS := $(shell $(SDL_CONFIG) --libs) -lSDL_mixer -lsmpeg -lgcc_r -lm #-lSDL_image --static
|
||||
+ LIBS := $(shell $(SDL_CONFIG) --libs) -lSDL_mixer -lsmpeg -lm #-lSDL_image --static
|
||||
endif
|
||||
OBJS = sprites.o niveaux.o pouvoirs.o evenements.o options.o son.o intro.o SFont/font.o
|
||||
ifeq ($(DEBUG),1)
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
# Sound-related definitions:
|
||||
|
||||
-MIXER=-lSDL_mixer
|
||||
+MIXER=-lSDL_mixer -lsmpeg -lgcc_r
|
||||
+MIXER=-lSDL_mixer -lsmpeg
|
||||
IMAGE=-lSDL_image
|
||||
NOSOUNDFLAG=__SOUND
|
||||
|
||||
|
@ -34,7 +34,7 @@
|
|||
+CFLAGS+=-Wall $(SDL_CFLAGS) \
|
||||
-DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(TARGET_DEF)
|
||||
-SDL_LIB=$(MIXER) $(IMAGE) $(SDL_LDFLAGS)
|
||||
+SDL_LIB=$(MIXER) $(IMAGE) $(SDL_LDFLAGS) -lgcc_r
|
||||
+SDL_LIB=$(MIXER) $(IMAGE) $(SDL_LDFLAGS)
|
||||
|
||||
|
||||
# Make commands:
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
bin_PROGRAMS = nil
|
||||
nil_SOURCES = obj_grenade.cpp obj_clusterbomb.cpp obj_weapon_clusterbomb.cpp obj_fireball.cpp obj_weapon_flamethrower.cpp obj_weapon_rocket.cpp obj_weapon_mininuke.cpp obj_weapon_larpa.cpp obj_rocket.cpp soundsystem.cpp event.cpp event_target.cpp menu_item.cpp menu.cpp obj_weapon_bignuke.cpp obj_tinygranade.cpp obj_bignuke.cpp update_queue.cpp keymapper_bindings.cpp keymapper.cpp animations.cpp anim_helpers.cpp animation.cpp obj_weapon_plasmagun.cpp obj_plasmaball.cpp fonts.cpp nil_files.cpp game_client.cpp configuration.cpp font_instance.cpp font_glyph.cpp icon_graph.cpp icon_base.cpp animator.cpp tcp_socket.cpp serializer_writer.cpp serializer_reader.cpp serializer.cpp serializable.cpp nil_math.cpp obj_railslug.cpp obj_weapon_railgun.cpp raw_surface.cpp obj_weapon_megashotgun.cpp obj_scoreboard.cpp graphic_bar.cpp obj_hook.cpp obj_weapon_shotgun.cpp obj_weapon_minigun.cpp obj_projectile.cpp obj_weapon_test.cpp obj_weapon.cpp obj_gib.cpp tcp_client.cpp nil_client.cpp nil_main.cpp nil_server.cpp tcp_server_connection.cpp tcp_server.cpp obj_player_data.cpp obj_particle.cpp controls.cpp obj_player.cpp clientworld.cpp serverworld.cpp world.cpp viewport.cpp obj_test.cpp obj_explosion.cpp obj_base.cpp loader.cpp graphics.cpp graphic.cpp fluff.cpp
|
||||
-nil_LDADD = -lSDL -lSDL_mixer -L/usr/X11R6/lib -lXxf86dga -lXxf86vm -lpthread -lz -lXext -lX11
|
||||
+nil_LDADD = -lSDL_mixer -lz -lsmpeg -lgcc_r
|
||||
+nil_LDADD = -lSDL_mixer -lz -lsmpeg
|
||||
|
||||
EXTRA_DIST = all.h fluff.cpp fluff.h graphic.cpp graphic.h graphics.cpp graphics.h loader.cpp loader.h obj_base.cpp obj_base.h obj_explosion.cpp obj_explosion.h obj_test.cpp obj_test.h viewport.cpp viewport.h world.cpp world.h serverworld.cpp serverworld.h clientworld.cpp clientworld.h obj_player.cpp obj_player.h controls.cpp controls.h obj_particle.cpp obj_particle.h obj_player_data.cpp obj_player_data.h tcp_server.cpp tcp_server.h tcp_server_connection.cpp tcp_server_connection.h nil_server.h nil_server.cpp nil_main.cpp nil_client.h nil_client.cpp tcp_client.cpp tcp_client.h obj_gib.cpp obj_gib.h obj_weapon.cpp obj_weapon.h obj_weapon_test.cpp obj_weapon_test.h obj_projectile.cpp obj_projectile.h obj_weapon_minigun.cpp obj_weapon_minigun.h obj_weapon_shotgun.cpp obj_weapon_shotgun.h obj_hook.cpp obj_hook.h graphic_bar.cpp graphic_bar.h obj_scoreboard.cpp obj_scoreboard.h obj_weapon_megashotgun.cpp obj_weapon_megashotgun.h raw_surface.cpp raw_surface.h obj_weapon_railgun.cpp obj_weapon_railgun.h obj_railslug.cpp obj_railslug.h nil_math.h nil_math.cpp systemheaders.h serializable.cpp serializable.h serializer.cpp serializer.h serializer_reader.cpp serializer_reader.h serializer_writer.cpp serializer_writer.h netpackets.h tcp_socket.cpp tcp_socket.h animator.cpp animator.h icon_base.cpp icon_base.h icon_graph.cpp icon_graph.h font_glyph.cpp font_glyph.h font_instance.cpp font_instance.h configuration.cpp configuration.h game_client.cpp game_client.h nil_files.h nil_files.cpp fonts.cpp fonts.h obj_plasmaball.cpp obj_plasmaball.h obj_weapon_plasmagun.cpp obj_weapon_plasmagun.h animation.cpp animation.h anim_helpers.h anim_helpers.cpp animations.cpp animations.h keymapper.cpp keymapper.h keymapper_bindings.h keymapper_bindings.cpp update_queue.cpp update_queue.h world_objects.h obj_bignuke.cpp obj_bignuke.h obj_tinygranade.cpp obj_tinygranade.h obj_weapon_bignuke.cpp obj_weapon_bignuke.h menu.cpp menu.h menu_item.cpp menu_item.h event_target.cpp event_target.h event.cpp event.h soundsystem.cpp soundsystem.h obj_rocket.cpp obj_rocket.h obj_weapon_larpa.cpp obj_weapon_larpa.h obj_weapon_mininuke.cpp obj_weapon_mininuke.h obj_weapon_rocket.cpp obj_weapon_rocket.h obj_weapon_clusterbomb.cpp obj_weapon_clusterbomb.h obj_clusterbomb.cpp obj_clusterbomb.h obj_grenade.cpp obj_grenade.h obj_fireball.cpp obj_weapon_flamethrower.cpp
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
INCLUDES = @XMMS_CFLAGS@ @SDL_CFLAGS@ @SMPEG_CFLAGS@
|
||||
-libsmpeg_xmms_la_LIBADD = @XMMS_LIBS@ @PTHREAD_LIBS@ @SDL_LIBS@ @SMPEG_LIBS@
|
||||
+libsmpeg_xmms_la_LIBADD = @XMMS_LIBS@ @PTHREAD_LIBS@ @SDL_LIBS@ @SMPEG_LIBS@ -lgcc_r
|
||||
+libsmpeg_xmms_la_LIBADD = @XMMS_LIBS@ @PTHREAD_LIBS@ @SDL_LIBS@ @SMPEG_LIBS@
|
||||
|
||||
libsmpeg_xmms_la_SOURCES = smpeg-xmms.c smpeg-xmms.h configure.c
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
INCLUDES = @XMMS_CFLAGS@ @SDL_CFLAGS@ @SMPEG_CFLAGS@
|
||||
-libsmpeg_xmms_la_LIBADD = @XMMS_LIBS@ @PTHREAD_LIBS@ @SDL_LIBS@ @SMPEG_LIBS@
|
||||
+libsmpeg_xmms_la_LIBADD = @XMMS_LIBS@ @PTHREAD_LIBS@ @SDL_LIBS@ @SMPEG_LIBS@ -lgcc_r
|
||||
+libsmpeg_xmms_la_LIBADD = @XMMS_LIBS@ @PTHREAD_LIBS@ @SDL_LIBS@ @SMPEG_LIBS@
|
||||
|
||||
libsmpeg_xmms_la_SOURCES = smpeg-xmms.c smpeg-xmms.h configure.c
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
|
|
|
@ -20,7 +20,7 @@ $FreeBSD$
|
|||
-CFLAGS = `gtk-config --cflags` -I$(PYTHON_PREFIX)/include/python1.5
|
||||
+GTK_LDFLAGS != $(GTK_CONFIG) --libs
|
||||
+GTK_CFLAGS != $(GTK_CONFIG) --cflags
|
||||
+LDFLAGS = -pthread -shared $(GTK_LDFLAGS) -lgtkscintilla -lgcc_r
|
||||
+LDFLAGS = -pthread -shared $(GTK_LDFLAGS) -lgtkscintilla
|
||||
+CFLAGS = -D_THREAD_SAFE $(GTK_CFLAGS) -I$(PYTHON_INCLUDEDIR) -I${X11BASE}/include/scintilla
|
||||
|
||||
all: _gtkscintillamodule.so
|
||||
|
|
Loading…
Reference in a new issue