Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4271 in orxonox.OLD


Ignore:
Timestamp:
May 22, 2005, 8:21:24 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: clean in subprojects too

Location:
orxonox/trunk/src/subprojects/gui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/subprojects/gui/Makefile.am

    r4266 r4271  
    3232bin_PROGRAMS = gui
    3333
    34 gui_DEPENDENCIES = $(MAINSRCDIR)/libORXgui.a
     34gui_DEPENDENCIES = $(MAINSRCDIR)/lib/gui/gui/libORXgui.a
    3535
    36 gui_LDADD = $(MAINSRCDIR)/libORXgui.a \
     36gui_LDADD = $(MAINSRCDIR)/lib/gui/gui/libORXgui.a \
    3737            $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    3838
     
    5353
    5454noinst_HEADERS=
    55 
    56 
    57 
    58 #bin_PROGRAMS=gui
    59 #gui_SOURCES=gui_main.cc \
    60 #           gui.cc \
    61 #           gui_gtk.cc \
    62 #           gui_element.cc \
    63 #           gui_video.cc \
    64 #           gui_audio.cc \
    65 #           gui_exec.cc \
    66 #           gui_flags.cc \
    67 #           gui_banner.cc \
    68 #           gui_keys.cc \
    69 #           gui_update.cc \
    70 #                 $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
    71 #                 $(MAINSRCDIR)/lib/lang/base_object.cc \
    72 #                 $(MAINSRCDIR)/lib/math/vector.cc \
    73 #                 $(MAINSRCDIR)/util/resource_manager.cc \
    74 #                 $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    75 #                 $(MAINSRCDIR)/lib/coord/p_node.cc \
    76 #                 $(MAINSRCDIR)/lib/coord/null_parent.cc \
    77 #                 $(MAINSRCDIR)/lib/graphics/importer/array.cc \
    78 #                 $(MAINSRCDIR)/lib/graphics/importer/model.cc \
    79 #                 $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
    80 #                 $(MAINSRCDIR)/lib/graphics/importer/material.cc \
    81 #                 $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
    82 #                 $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
    83 #
  • orxonox/trunk/src/subprojects/gui/Makefile.in

    r4268 r4271  
    196196AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/tinyxml -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/util/track -I$(MAINSRCDIR)/subprojects
    197197AM_LDFLAGS = $(MWINDOWS)
    198 gui_DEPENDENCIES = $(MAINSRCDIR)/libORXgui.a
    199 gui_LDADD = $(MAINSRCDIR)/libORXgui.a \
     198gui_DEPENDENCIES = $(MAINSRCDIR)/lib/gui/gui/libORXgui.a
     199gui_LDADD = $(MAINSRCDIR)/lib/gui/gui/libORXgui.a \
    200200            $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    201201
     
    688688        uninstall-am uninstall-binPROGRAMS uninstall-info-am
    689689
    690 
    691 #bin_PROGRAMS=gui
    692 #gui_SOURCES=gui_main.cc \
    693 #           gui.cc \
    694 #           gui_gtk.cc \
    695 #           gui_element.cc \
    696 #           gui_video.cc \
    697 #           gui_audio.cc \
    698 #           gui_exec.cc \
    699 #           gui_flags.cc \
    700 #           gui_banner.cc \
    701 #           gui_keys.cc \
    702 #           gui_update.cc \
    703 #                 $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
    704 #                 $(MAINSRCDIR)/lib/lang/base_object.cc \
    705 #                 $(MAINSRCDIR)/lib/math/vector.cc \
    706 #                 $(MAINSRCDIR)/util/resource_manager.cc \
    707 #                 $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    708 #                 $(MAINSRCDIR)/lib/coord/p_node.cc \
    709 #                 $(MAINSRCDIR)/lib/coord/null_parent.cc \
    710 #                 $(MAINSRCDIR)/lib/graphics/importer/array.cc \
    711 #                 $(MAINSRCDIR)/lib/graphics/importer/model.cc \
    712 #                 $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
    713 #                 $(MAINSRCDIR)/lib/graphics/importer/material.cc \
    714 #                 $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
    715 #                 $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
    716 #
    717690# Tell versions [3.59,3.63) of GNU make to not export all variables.
    718691# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.