Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: orxonox.OLD/orxonox/branches/levelloader/src/subprojects/testmain/Makefile.am @ 3770

Last change on this file since 3770 was 3605, checked in by bensch, 20 years ago

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit :)

Conflits in world.cc are a MESS: fix it
File size: 737 bytes
Line 
1MAINSRCDIR=../..
2AM_CXXFLAGS=-I$(MAINSRCDIR)
3AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities
4AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities
5AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib
6AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
7AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
8AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
9AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
10AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
11AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
12AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
13AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
14AM_CXXFLAGS+=-I$(MAINSRCDIR)/network
15AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
16AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
17
18
19AM_LDFLAGS=$(MWINDOWS)
20
21#"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
22
23
24bin_PROGRAMS=testmain
25testmain_SOURCES= testmain.cc
26
27noinst_HEADERS=
Note: See TracBrowser for help on using the repository browser.