No OneTemporary
Actions

Authored By

Unknown

Size

9 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/SConstruct b/SConstruct
	index 4536657a..c07799ac 100644
	--- a/SConstruct
	+++ b/SConstruct
	@@ -1,53 +1,54 @@
	import os
	import scons.utils
	import scons.checks

	SetOption('num_jobs', scons.utils.detectCPUs())

	includedir = '{0}/include'.format(os.getcwd())

	env = Environment(ENV = os.environ, CPPPATH=includedir, tools=['textfile', 'default'])
	config = env.Configure(custom_tests = {'CheckAllegro5': scons.checks.checkAllegro5(False)})
	config.CheckAllegro5()
	env = config.Finish()

	#TODO Need to do separate checks later
	env.ParseConfig('freetype-config --libs --cflags')

	build_dir = 'build'
	options = {'networking': False,
	'allegro5': True
	}

	scons.checks.configChecks(env)

	env.VariantDir(build_dir, 'src')
	-rtech1 = env.StaticLibrary('lib/r-tech1', env.SConscript('src/SConscript', variant_dir=build_dir, exports=['env', 'options']))
	+libs = env.SConscript('src/SConscript', variant_dir=build_dir, exports=['env', 'options'])
	+rtech1 = env.StaticLibrary('lib/r-tech1', libs)
	env.Default(rtech1)

	# Install target and configuration
	env.Install('{0}/lib'.format(env.installPrefix), rtech1)
	env.Install('{0}/include'.format(env.installPrefix), 'include/r-tech1')

	# PC script
	replacelist = {
	'%prefix%': env.installPrefix,
	'%rtech1_version%': '1',
	}

	pc_install = '{0}/lib/pkgconfig/r-tech1.pc'.format(env.installPrefix)

	pc_copied = Command(build_dir + '/temp.pc.in', 'misc/r-tech1.pc.in', Copy('$TARGET', '$SOURCE'))
	pc_script = env.Substfile(build_dir + '/temp.pc.in', SUBST_DICT = replacelist)
	env.Depends(pc_script, pc_copied)
	pc_mod = Command(build_dir + '/r-tech1.pc', build_dir + '/temp.pc', Copy('$TARGET', '$SOURCE'))
	env.Depends(pc_mod, pc_script)
	env.InstallAs(pc_install, pc_mod)

	# Install
	env.Alias('install', [env.installPrefix, pc_install])
	env.Depends([env.installPrefix, pc_mod], rtech1)

	# Uninstall target
	env.Command("uninstall", None, Delete(FindInstalledFiles()))

	diff --git a/src/SConscript b/src/SConscript
	index b9e894cd..f6bac376 100644
	--- a/src/SConscript
	+++ b/src/SConscript
	@@ -1,61 +1,61 @@
	Import('env', 'options')

	from scons import helpers
	import os.path

	def tryKey(hashx, key, default):
	try:
	return hashx[key]
	except KeyError:
	return default

	def useNetwork(options):
	return tryKey(options, 'networking', False)

	def utilLibrary(env):
	modules = helpers.read_cmake_list(helpers.findFile('src/CMakeLists.txt'))

	source = []
	for module in modules:
	- source.append(modules[module])
	-
	- return env.StaticLibrary('util', source)
	+ source.append(env.Object(modules[module]))
	+
	+ return source

	def minizipLibrary(env):
	return env.SConscript('libs/zip/SConscript', exports = ['env'])

	def gmeLibrary(env):
	use = env
	return SConscript('libs/gme/SConscript', exports = ['use'])

	def lzmaLibrary7z(env):
	use = env
	return SConscript('libs/7z/SConscript', exports = ['use'])

	def sflLibrary(env):
	use = env
	return SConscript('libs/sfl/SConscript', exports = ['use'])

	def pcreLibrary(env):
	pcreEnv = env.Clone()
	env = pcreEnv
	return env.SConscript('libs/pcre/SConstruct', exports = ['env'])

	def dumbLibrary(env):
	dumbEnv = env.Clone()
	env = dumbEnv
	return env.SConscript('libs/dumb/SConscript', exports = ['env'])

	def hawknlLibrary(env):
	hawkEnv = env.Clone()
	env = hawkEnv
	# if isOSX():
	# env.Append(CPPDEFINES = 'MACOSX')
	return env.SConscript('libs/hawknl/SConscript', exports = ['env'])

	all = [utilLibrary(env), minizipLibrary(env), gmeLibrary(env), lzmaLibrary7z(env), sflLibrary(env), pcreLibrary(env), dumbLibrary(env)]

	if useNetwork(options):
	all.append(hawknlLibrary(env))

	Return('all')
	diff --git a/src/libs/7z/SConscript b/src/libs/7z/SConscript
	index cfabf15f..ff311af6 100644
	--- a/src/libs/7z/SConscript
	+++ b/src/libs/7z/SConscript
	@@ -1,19 +1,19 @@
	Import('use')

	#source = Split("""
	#7zAlloc.c 7zBuf.c 7zBuf2.c 7zCrc.c 7zCrcOpt.c 7zDec.c 7zIn.c CpuArch.c LzmaDec.c Lzma2Dec.c Bra.c Bra86.c Bcj2.c 7zFile.c 7zStream.c
	#""")
	# Ppmd7.c
	# Ppmd7Dec.c


	from scons import helpers
	import os.path
	modules = helpers.read_cmake_list(helpers.findFile('src/libs/7z/CMakeLists.txt'))

	source = []
	for module in modules:
	- source.append(modules[module])
	+ #source.append(modules[module])
	+ source.append(use.Object(modules[module]))

	-out = use.StaticLibrary('7z-local', source)
	-Return('out')
	+Return('source')
	diff --git a/src/libs/dumb/SConscript b/src/libs/dumb/SConscript
	index 6601c322..f47c4fb7 100644
	--- a/src/libs/dumb/SConscript
	+++ b/src/libs/dumb/SConscript
	@@ -1,75 +1,76 @@
	import os
	Import( 'env' )

	# env = Environment( ENV = os.environ )

	source = Split("""
	it/itorder.c
	it/xmeffect.c
	it/itrender.c
	it/itread2.c
	it/itunload.c
	it/loadmod.c
	it/loads3m.c
	it/loadxm2.c
	it/itload2.c
	it/readmod2.c
	it/reads3m2.c
	it/loadmod2.c
	it/loadxm.c
	it/loads3m2.c
	it/itload.c
	it/itmisc.c
	it/itread.c
	it/readxm.c
	it/readmod.c
	it/reads3m.c
	it/readxm2.c
	core/makeduh.c
	core/unload.c
	core/loadduh.c
	core/rawsig.c
	core/rendduh.c
	core/rendsig.c
	core/duhlen.c
	core/duhtag.c
	core/atexit.c
	core/readduh.c
	core/register.c
	core/dumbfile.c
	helpers/sampbuf.c
	helpers/stdfile.c
	helpers/clickrem.c
	helpers/silence.c
	helpers/memfile.c
	helpers/resample.c
	allegro/alplay.c
	""");

	unused = Split("""
	allegro/datit.c
	allegro/datxm.c
	allegro/datduh.c
	allegro/datitq.c
	allegro/datmod.c
	allegro/dats3m.c
	allegro/datxmq.c
	allegro/datmodq.c
	allegro/dats3mq.c
	allegro/datunld.c
	allegro/packfile.c
	""")

	# helpers/resample.inc
	# helpers/resamp2.inc
	# helpers/resamp3.inc

	env.Prepend(CPPPATH = ['include','include/internal'])
	# env.Append( CCFLAGS = ['-Wall','-W','-Wwrite-strings','-Wstrict-prototypes','-Wmissing-declarations', '-O2', '-ffast-math', '-fomit-frame-pointer', '-Wno-missing-declarations'] )
	env.Append( CCFLAGS = ['-Wall','-W','-Wwrite-strings','-Wstrict-prototypes','-Wmissing-declarations', '-ffast-math', '-Wno-missing-declarations'] )

	env.Append( CPPDEFINES = 'DUMB_DECLARE_DEPRECATED' )

	-# env.BuildDir( 'build', 'src' )
	-x = env.StaticLibrary( 'paintown-dumb', map( lambda x: 'src/%s' % x, source ) )
	+x = []
	+for s in map( lambda x: 'src/%s' % x, source ):
	+ x.append(env.Object(s))
	Return( 'x' )
	diff --git a/src/libs/gme/SConscript b/src/libs/gme/SConscript
	index 360a1458..0618fde9 100644
	--- a/src/libs/gme/SConscript
	+++ b/src/libs/gme/SConscript
	@@ -1,23 +1,26 @@
	Import('use')

	gmeEnv = use.Clone()

	# These things are defined by gme_types.h
	if False:
	gmeEnv.Append(CPPDEFINES = Split("""USE_GME_NSF USE_GME_NSFE USE_GME_KSS
	USE_GME_AY USE_GME_GBS USE_GME_GYM USE_GME_HES USE_GME_SAP USE_GME_SPC USE_GME_VGM
	"""))

	source = Split("""Ay_Apu.cpp Ay_Cpu.cpp Ay_Emu.cpp Blip_Buffer.cpp
	Classic_Emu.cpp Data_Reader.cpp Dual_Resampler.cpp Effects_Buffer.cpp
	Fir_Resampler.cpp Gb_Apu.cpp Gb_Cpu.cpp Gb_Oscs.cpp Gbs_Emu.cpp gme.cpp
	Gme_File.cpp Gym_Emu.cpp Hes_Apu.cpp Hes_Cpu.cpp Hes_Emu.cpp Kss_Cpu.cpp
	Kss_Emu.cpp Kss_Scc_Apu.cpp M3u_Playlist.cpp Multi_Buffer.cpp Music_Emu.cpp
	Nes_Apu.cpp Nes_Cpu.cpp Nes_Fme7_Apu.cpp Nes_Namco_Apu.cpp Nes_Oscs.cpp
	Nes_Vrc6_Apu.cpp Nsfe_Emu.cpp Nsf_Emu.cpp Sap_Apu.cpp Sap_Cpu.cpp Sap_Emu.cpp
	Sms_Apu.cpp Snes_Spc.cpp Spc_Cpu.cpp Spc_Dsp.cpp Spc_Emu.cpp Vgm_Emu.cpp
	Vgm_Emu_Impl.cpp Ym2413_Emu.cpp Ym2612_Emu.cpp""")

	-library = gmeEnv.StaticLibrary('gme', source)
	+library = []
	+for s in source:
	+ library.append(gmeEnv.Object(s))
	+
	Return('library')

	diff --git a/src/libs/hawknl/SConscript b/src/libs/hawknl/SConscript
	index 25d3e524..b12903c3 100644
	--- a/src/libs/hawknl/SConscript
	+++ b/src/libs/hawknl/SConscript
	@@ -1,25 +1,27 @@
	import os
	Import( 'env' )

	# env = Environment( ENV = os.environ )

	source = Split("""
	src/crc.cpp
	src/err.cpp
	src/errorstr.cpp
	src/group.cpp
	src/ipx.cpp
	src/loopback.cpp
	src/nl.cpp
	src/nltime.cpp
	src/sock.cpp
	""");

	# src/hthread.cpp
	# src/htcondition.cpp
	# src/htmutex.cpp

	# env.Append(CPPPATH = 'hawknl')

	-x = env.StaticLibrary('hawknl', source)
	+x = []
	+for s in source:
	+ x.append(env.Object(s))
	Return('x')
	diff --git a/src/libs/pcre/SConstruct b/src/libs/pcre/SConstruct
	index 5f4f07fc..f96fa38e 100644
	--- a/src/libs/pcre/SConstruct
	+++ b/src/libs/pcre/SConstruct
	@@ -1,34 +1,36 @@
	Import('env')

	source = Split("""
	pcre_chartables.c
	pcre_compile.c
	pcre_config.c
	pcre_dfa_exec.c
	pcre_exec.c
	pcre_fullinfo.c
	pcre_get.c
	pcre_globals.c
	pcre_info.c
	pcre_maketables.c
	pcre_newline.c
	pcre_ord2utf8.c
	pcreposix.c
	pcre_refcount.c
	pcre_study.c
	pcre_tables.c
	pcre_try_flipped.c
	pcre_ucd.c
	pcre_valid_utf8.c
	pcre_version.c
	pcre_xclass.c
	""")

	unused = Split("""
	dftables.c
	pcredemo.c
	pcretest.c
	""")

	-x = env.StaticLibrary('pcre', source)
	+x = []
	+for s in source:
	+ x.append(env.Object(s))
	Return('x')
	diff --git a/src/libs/sfl/SConscript b/src/libs/sfl/SConscript
	index 9130a830..b1f8a885 100644
	--- a/src/libs/sfl/SConscript
	+++ b/src/libs/sfl/SConscript
	@@ -1,14 +1,16 @@
	Import('use')

	source = Split("""sflbits.c sflcomp.c sflcons.c sflconv.c sflcryp.c sflcvbs.c
	sflcvdp.c sflcvds.c sflcvns.c sflcvsb.c sflcvsd.c sflcvsn.c sflcvtp.c sflcvts.c
	sfldbio.c sfldir.c sflenv.c sflexdr.c sflfile.c sflfind.c sflfort.c sflhttp.c
	sflini.c sfllang.c sfllbuf.c sfllist.c sflmath.c sflmem.c sflmesg.c sflmime.c
	sflnode.c sflprint.c sflslot.c sflstr.c sflsymb.c sflsyst.c sfltok.c sfltree.c
	sfltron.c sflxml.c sfluid.c sfldate.c
	""")

	ignored = Split("""sflcvst.c sflxmll.c sflproc.c sflsock.c sflmysql.c""")

	-x = use.StaticLibrary('sfl', source)
	+x = []
	+for s in source:
	+ x.append(use.Object(s))
	Return('x')
	diff --git a/src/libs/zip/SConscript b/src/libs/zip/SConscript
	index b0252fdc..b047cb75 100644
	--- a/src/libs/zip/SConscript
	+++ b/src/libs/zip/SConscript
	@@ -1,7 +1,9 @@
	Import('env')

	zenv = env.Clone()
	source = Split("""ioapi.c unzip.c zip.c""")

	-library = zenv.StaticLibrary('minizip', source)
	+library = []
	+for s in source:
	+ library.append(env.Object(s))
	Return('library')

File Metadata

Mime Type: text/x-diff
Expires: Mon, Jun 15, 11:34 PM (2 w, 2 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 70115
Default Alt Text: (9 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions