Changeset 7608 in orxonox.OLD for branches/qt_gui/src/Makefile.am

Timestamp:

May 12, 2006, 10:43:53 AM (19 years ago)

Author:

bensch

Message:

merged the old qt-gui back with
svn merge -r7438:HEAD ​https://svn.orxonox.net/orxonox/branches/qt_gui_old .
minor conflict in BuildLibs.am

File:

• branches/qt_gui/src/Makefile.am (modified) (4 diffs)

branches/qt_gui/src/Makefile.am

@@ -12 +12 @@
 bin_PROGRAMS = orxonox
 
-orxonox_CPPFLAGS = -DIS_ORXONOX
-orxonox_LDFLAGS = -u global_ModelParticles_Factory
+orxonox_CPPFLAGS = \
+                -DIS_ORXONOX \
+                @QT_CXXFLAGS@
+
+orxonox_LDFLAGS = @QT_LDFLAGS@
 
 orxonox_DEPENDENCIES = \
@@ -24 +27 @@
                 util/libORXutils.a \
                 $(libORXlibs_a_LIBRARIES_) \
-                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
+                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
+                @QT_LIBS@
 
 orxonox_SOURCES = \
@@ -66 +70 @@
 
 ## orxonox.conf will be used from home-dir instead.
-EXTRA_DIST = proto/proto_class.h \
-             proto/proto_class.cc \
-             proto/proto_singleton.h \
-             proto/proto_singleton.cc \
-             proto/proto_world_entity.h \
-             proto/proto_world_entity.cc \
-             defs/include_paths.am \
-             story_entities/Makefile.am
+EXTRA_DIST = \
+                proto/proto_class.h \
+                proto/proto_class.cc \
+                proto/proto_singleton.h \
+                proto/proto_singleton.cc \
+                proto/proto_world_entity.h \
+                proto/proto_world_entity.cc \
+                defs/include_paths.am \
+                story_entities/Makefile.am
 
 if SUB_PROJECTS
@@ -81 +86 @@
 endif
 
-SUBDIRS = lib \
-          util \
-          world_entities \
-          . \
-          $(SUB_PROGS)
+SUBDIRS = \
+                lib \
+                util \
+                world_entities \
+                . \
+                $(SUB_PROGS)