josh/treacherous-terrain
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add include path for all source directories

Browse Source
This commit is contained in:
Josh Holtrop 2012-09-06 00:33:40 -04:00
parent e2ebe6afa4
commit 2adebf36f4
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
SConstruct
View File

@ -9,6 +9,14 @@ server_name = client_name + '-server'
CCFS_ROOT = 'assets/fs' CCFS_ROOT = 'assets/fs'
def find_dirs_under(path):
dirs = [path]
for ent in os.listdir(path):
ent_path = '%s/%s' % (path, ent)
if os.path.isdir(ent_path):
dirs += find_dirs_under(ent_path)
return dirs
def find_sources_under(path): def find_sources_under(path):
sources = [] sources = []
for ent in os.listdir(path): for ent in os.listdir(path):
@ -36,10 +44,13 @@ SFML_PATH_PREFIX = '/c/apps' if platform == 'windows' else '/opt'
SFML_PATH = '%s/SFML-%s' % (SFML_PATH_PREFIX, SFML_VERSION) SFML_PATH = '%s/SFML-%s' % (SFML_PATH_PREFIX, SFML_VERSION)
if 'SFML_PATH' in os.environ: if 'SFML_PATH' in os.environ:
SFML_PATH = os.environ['SFML_PATH'] SFML_PATH = os.environ['SFML_PATH']
CPPFLAGS = ['-I%s/include' % SFML_PATH, '-DGL_INCLUDE_FILE=\\"GL/glew.h\\"']
LIBPATH = ['%s/lib' % SFML_PATH] LIBPATH = ['%s/lib' % SFML_PATH]
for dirent in os.listdir('src'): CPPFLAGS = []
CPPFLAGS.append('-I%s/src/%s' % (os.getcwd(), dirent)) CPPFLAGS += map(lambda x: '-I' + x, find_dirs_under('src/common'))
CPPFLAGS_client = ['-I%s/include' % SFML_PATH,
'-DGL_INCLUDE_FILE=\\"GL/glew.h\\"']
CPPFLAGS_client += map(lambda x: '-I' + x, find_dirs_under('src/client'))
CPPFLAGS_server = map(lambda x: '-I' + x, find_dirs_under('src/server'))
if platform == 'windows': if platform == 'windows':
# Windows-specific environment settings # Windows-specific environment settings
@ -68,15 +79,16 @@ else:
# our sources # our sources
sources_client = (find_sources_under('src/common') + sources_client = (find_sources_under('src/common') +
find_sources_under('src/client')) find_sources_under('src/client'))
if 'src/client/ccfs.cc' not in sources_client:
sources_client.append('src/client/ccfs.cc')
sources_server = (find_sources_under('src/common') + sources_server = (find_sources_under('src/common') +
find_sources_under('src/server') + find_sources_under('src/server'))
['src/client/ccfs.cc'])
# create the scons environments # create the scons environments
env_client = Environment( env_client = Environment(
CC = CC, CC = CC,
CXX = CXX, CXX = CXX,
CPPFLAGS = CPPFLAGS, CPPFLAGS = CPPFLAGS + CPPFLAGS_client,
CXXFLAGS = CXXFLAGS, CXXFLAGS = CXXFLAGS,
LINKFLAGS = LINKFLAGS, LINKFLAGS = LINKFLAGS,
LIBPATH = LIBPATH, LIBPATH = LIBPATH,
@ -85,7 +97,7 @@ env_server = Environment(
OBJSUFFIX = '-server.o', OBJSUFFIX = '-server.o',
CC = CC, CC = CC,
CXX = CXX, CXX = CXX,
CPPFLAGS = CPPFLAGS, CPPFLAGS = CPPFLAGS + CPPFLAGS_server,
CXXFLAGS = CXXFLAGS, CXXFLAGS = CXXFLAGS,
LINKFLAGS = LINKFLAGS, LINKFLAGS = LINKFLAGS,
LIBPATH = LIBPATH, LIBPATH = LIBPATH,