Fix for gcc-4.6 from Nils Larsson; pass --no-as-needed to g++ in order to allow building on Ubuntu 11.10
parent
6a20a09673
commit
dd3c34dc13
|
@ -14,6 +14,7 @@
|
||||||
#define _CELENGINE_FRAMETREE_H_
|
#define _CELENGINE_FRAMETREE_H_
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <cstddef>
|
||||||
|
|
||||||
class Star;
|
class Star;
|
||||||
class Body;
|
class Body;
|
||||||
|
|
|
@ -55,7 +55,7 @@ if ENABLE_THEORA
|
||||||
THEORASOURCES = oggtheoracapture.cpp
|
THEORASOURCES = oggtheoracapture.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
celestia_CXXFLAGS = $(LUA_CFLAGS) $(SPICE_CFLAGS) $(THEORA_CFLAGS)
|
celestia_CXXFLAGS = $(LUA_CFLAGS) $(SPICE_CFLAGS) $(THEORA_CFLAGS) -Wl,--no-as-needed
|
||||||
|
|
||||||
celestia_SOURCES = $(COMMONSOURCES) $(CELXSOURCES) $(GLUTSOURCES) $(THEORASOURCES)
|
celestia_SOURCES = $(COMMONSOURCES) $(CELXSOURCES) $(GLUTSOURCES) $(THEORASOURCES)
|
||||||
|
|
||||||
|
|
|
@ -80,7 +80,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/
|
||||||
|
|
||||||
BUILT_SOURCES = $(MOC_CPP_FILES) $(QRC_CPP_FILES) $(UI_H_FILES)
|
BUILT_SOURCES = $(MOC_CPP_FILES) $(QRC_CPP_FILES) $(UI_H_FILES)
|
||||||
|
|
||||||
libqtgui_a_CXXFLAGS = $(LUA_CFLAGS) $(QT_CFLAGS) $(THEORA_CFLAGS)
|
libqtgui_a_CXXFLAGS = $(LUA_CFLAGS) $(QT_CFLAGS) $(THEORA_CFLAGS) -Wl,--no-as-needed
|
||||||
|
|
||||||
libqtgui_a_SOURCES = \
|
libqtgui_a_SOURCES = \
|
||||||
$(MOC_CPP_FILES) \
|
$(MOC_CPP_FILES) \
|
||||||
|
|
Loading…
Reference in New Issue