Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4338 in orxonox.OLD for orxonox/trunk/src/lib/gui/gui/Makefile.in


Ignore:
Timestamp:
May 27, 2005, 9:16:53 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged branches/physics back to the trunk
merged with command
svn merge -r 3866:HEAD . ../../trunk/
many conflict that i tried to resolv
@patrick: i hope i did not interfere with your stuff :/

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/lib/gui/gui/Makefile.in

    r4276 r4338  
    200200AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    201201noinst_LIBRARIES = libORXgui.a
    202 libORXgui_a_CPPFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     202libORXgui_a_CPPFLAGS = -DBUILD_ORXONOX \
     203                        $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     204
    203205libORXgui_a_SOURCES = gui.cc \
    204206                      gui_gtk.cc \
Note: See TracChangeset for help on using the changeset viewer.