From 1e064b6a8b0343159ea93576523a51297a108334 Mon Sep 17 00:00:00 2001 From: Ben Anderson Date: Mon, 19 Feb 2007 05:19:07 +0000 Subject: [PATCH] SCons compilation is working again. It runs too. Thanks for the pointers Steve. --- stepmania/src/SConscript | 86 ++++++++++++---- stepmania/src/libtomcrypt/SConscript | 140 +++++++++++++++++++++++++++ stepmania/src/libtommath/SConscript | 39 ++++++++ 3 files changed, 248 insertions(+), 17 deletions(-) create mode 100644 stepmania/src/libtomcrypt/SConscript create mode 100644 stepmania/src/libtommath/SConscript diff --git a/stepmania/src/SConscript b/stepmania/src/SConscript index d7149e73eb..d0aa38cbb1 100644 --- a/stepmania/src/SConscript +++ b/stepmania/src/SConscript @@ -202,6 +202,7 @@ conf = Configure(env, custom_tests = { 'CstdlibLlabsTest' : CstdlibLlabsTest }) Lights = [ + "arch/Lights/LightsDriver.cpp", "arch/Lights/LightsDriver_SystemMessage.cpp", ] @@ -210,7 +211,7 @@ if cpuTypeI == 1: env.Append(CPPDEFINES=["CPU_X86"]) if env['PLATFORM'] == 'posix': # NOPORT: Again, assuming Linux - env.Append(CPPDEFINES=["BACKTRACE_METHOD_X86_LINUX"]) + env.Append(CPPDEFINES=["BACKTRACE_METHOD_X86_LINUX", "LUA_USE_LINUX"]) Lights += [ "arch/Lights/LightsDriver_LinuxWeedTech.cpp", "arch/Lights/LightsDriver_LinuxParallel.cpp" ] elif cpuTypeI == 2: env.Append(CPPDEFINES=["CPU_PPC"]) @@ -326,6 +327,8 @@ DataStructures = [ "GameCommand.cpp", "GameConstantsAndTypes.cpp", "GameInput.cpp", + "GameplayAssist.cpp", + "GamePreferences.cpp", "Grade.cpp", "HighScore.cpp", "Inventory.cpp", @@ -333,7 +336,6 @@ DataStructures = [ "LuaReference.cpp", "LuaExpressionTransform.cpp", "LyricsLoader.cpp", - "MenuInput.cpp", "ModsGroup.cpp", "NoteData.cpp", "NoteDataUtil.cpp", @@ -358,14 +360,17 @@ DataStructures = [ "RadarValues.cpp", "RoomInfoDisplay.cpp", "RoomWheel.cpp", + "SampleHistory.cpp", "ScreenDimensions.cpp", "ScoreKeeper.cpp", + "ScoreKeeperGuitar.cpp", "ScoreKeeperNormal.cpp", "ScoreKeeperRave.cpp", "Song.cpp", "SongCacheIndex.cpp", "SongOptions.cpp", "SongUtil.cpp", + "SoundEffectControl.cpp", "StageStats.cpp", "Steps.cpp", "StepsUtil.cpp", @@ -391,9 +396,11 @@ StepMania = [ "GameLoop.cpp", "global.cpp", "SpecialFiles.cpp", + "arch/RageDriver.cpp", ] Sound = [ + "arch/Sound/RageSoundDriver.cpp", "arch/Sound/RageSoundDriver_Null.cpp", "arch/Sound/RageSoundDriver_Generic_Software.cpp", ] @@ -404,6 +411,7 @@ MemoryCard = [ Dialog = [ "arch/Dialog/Dialog.cpp", + "arch/Dialog/DialogDriver.cpp", ] RageSoundFileReaders = [ @@ -425,9 +433,14 @@ InputHandler = [ "arch/InputHandler/InputHandler_MonkeyKeyboard.cpp", ] -LowLevelWindow = [] +LoadingWindow = [ + "arch/LoadingWindow/LoadingWindow.cpp", +] + +LowLevelWindow = [ + "arch/LowLevelWindow/LowLevelWindow.cpp", +] Threads = [] -LoadingWindow = [] ArchUtils = [] # # # Detection stuff here, it's easiest @@ -514,8 +527,7 @@ if env['PLATFORM'] == 'posix': env.Append(CPPDEFINES=["HAVE_ALSA"]) Sound += [ "arch/Sound/ALSA9Dynamic.cpp", "arch/Sound/ALSA9Helpers.cpp", - "arch/Sound/RageSoundDriver_ALSA9_Software.cpp", - "arch/Sound/RageSoundDriver_ALSA9.cpp" ] + "arch/Sound/RageSoundDriver_ALSA9_Software.cpp" ] # OSS is available on POSIX OSes besides Linux if conf.CheckHeader('sys/soundcard.h'): env.Append(CPPDEFINES=["HAVE_OSS"]) @@ -538,9 +550,7 @@ if conf.CheckLib('X11', 'XMapWindow') and conf.CheckLib('Xrandr', 'XRRSizes'): Arch = LoadingWindow + Sound + ArchHooks + InputHandler + MovieTexture +\ Lights + MemoryCard + LowLevelWindow + ArchUtils + Dialog +\ - Threads + [ - "arch/arch.cpp", -] + Threads ActorsInGameplayAndMenus = [ "BGAnimation.cpp", @@ -633,6 +643,37 @@ PCRE = [ "pcre/study.c", ] +Lua = [ "lua-5.1/src/lapi.c", + "lua-5.1/src/lauxlib.c", + "lua-5.1/src/lbaselib.c", + "lua-5.1/src/lcode.c", + "lua-5.1/src/ldblib.c", + "lua-5.1/src/ldebug.c", + "lua-5.1/src/ldo.c", + "lua-5.1/src/ldump.c", + "lua-5.1/src/lfunc.c", + "lua-5.1/src/lgc.c", + "lua-5.1/src/linit.c", + "lua-5.1/src/liolib.c", + "lua-5.1/src/llex.c", + "lua-5.1/src/lmathlib.c", + "lua-5.1/src/lmem.c", + "lua-5.1/src/loadlib.c", + "lua-5.1/src/lobject.c", + "lua-5.1/src/lopcodes.c", + "lua-5.1/src/loslib.c", + "lua-5.1/src/lparser.c", + "lua-5.1/src/lstate.c", + "lua-5.1/src/lstring.c", + "lua-5.1/src/lstrlib.c", + "lua-5.1/src/ltable.c", + "lua-5.1/src/ltablib.c", + "lua-5.1/src/ltm.c", + "lua-5.1/src/lundump.c", + "lua-5.1/src/lvm.c", + "lua-5.1/src/lzio.c", +] + RageFile = [ "RageFileBasic.cpp", "RageFile.cpp", @@ -664,12 +705,17 @@ Rage = PCRE + RageFile + RageSoundFileReaders + [ "RageSoundUtil.cpp", "RageSoundMixBuffer.cpp", "RageSoundPosMap.cpp", - "RageSoundReader_FileReader.cpp", - "RageSoundReader_Preload.cpp", - "RageSoundReader_Resample.cpp", - "RageSoundReader_Resample_Fast.cpp", - "RageSoundReader_Resample_Good.cpp", + "RageSoundReader.cpp", "RageSoundReader_Chain.cpp", + "RageSoundReader_Extend.cpp", + "RageSoundReader_FileReader.cpp", + "RageSoundReader_Pan.cpp", + "RageSoundReader_PitchChange.cpp", + "RageSoundReader_PostBuffering.cpp", + "RageSoundReader_Preload.cpp", + "RageSoundReader_Resample_Good.cpp", + "RageSoundReader_SpeedChange.cpp", + "RageSoundReader_ThreadedBuffer.cpp", "RageSurface.cpp", "RageSurfaceUtils.cpp", "RageSurfaceUtils_Dither.cpp", @@ -735,7 +781,6 @@ GlobalSingletons = [ "MemoryCardManager.cpp", "MessageManager.cpp", "NetworkSyncManager.cpp", - "NetworkSyncServer.cpp", "NoteSkinManager.cpp", "PrefsManager.cpp", "ProfileManager.cpp", @@ -785,9 +830,16 @@ cryptopp = [ env = conf.Finish() -env.Append(CPPFLAGS=' -g2', CPPPATH=['.']) # NOPORT debug symbols? +# This must be after configuration stuff apparently +SConscript(['libtommath/SConscript']) +SConscript(['libtomcrypt/SConscript']) + +env.Append(LIBS=["tomcrypt", "tommath"], + LIBPATH=["libtommath", "libtomcrypt"], + CPPFLAGS=' -g2', CPPPATH=['.']) # NOPORT debug symbols? +# env.Append(CFLAGS=env['CPPFLAGS'], CPATH=env['CPPPATH'] # For lua env.Program('stepmania', Screens + DataStructures + FileTypes + StepMania + Arch +\ ActorsInGameplayAndMenus + ActorsInMenus + ActorsInGameplay + Rage +\ - Actors + GlobalSingletons + crypto + cryptopp ) + Actors + GlobalSingletons + crypto + cryptopp + Lua ) diff --git a/stepmania/src/libtomcrypt/SConscript b/stepmania/src/libtomcrypt/SConscript new file mode 100644 index 0000000000..4612039e98 --- /dev/null +++ b/stepmania/src/libtomcrypt/SConscript @@ -0,0 +1,140 @@ +StaticLibrary("tomcrypt", [ + 'src/ciphers/aes/aes.c', + 'src/hashes/md5.c', + 'src/hashes/sha1.c', + 'src/hashes/helper/hash_memory.c', + 'src/math/fp/ltc_ecc_fp_mulmod.c', + 'src/math/ltm_desc.c', + 'src/math/multi.c', + 'src/math/rand_prime.c', + 'src/misc/base64/base64_decode.c', + 'src/misc/base64/base64_encode.c', + 'src/misc/burn_stack.c', + 'src/misc/crypt/crypt.c', + 'src/misc/crypt/crypt_argchk.c', + 'src/misc/crypt/crypt_cipher_descriptor.c', + 'src/misc/crypt/crypt_cipher_is_valid.c', + 'src/misc/crypt/crypt_find_cipher.c', + 'src/misc/crypt/crypt_find_cipher_any.c', + 'src/misc/crypt/crypt_find_cipher_id.c', + 'src/misc/crypt/crypt_find_hash.c', + 'src/misc/crypt/crypt_find_hash_any.c', + 'src/misc/crypt/crypt_find_hash_id.c', + 'src/misc/crypt/crypt_find_hash_oid.c', + 'src/misc/crypt/crypt_find_prng.c', + 'src/misc/crypt/crypt_fsa.c', + 'src/misc/crypt/crypt_hash_descriptor.c', + 'src/misc/crypt/crypt_hash_is_valid.c', + 'src/misc/crypt/crypt_ltc_mp_descriptor.c', + 'src/misc/crypt/crypt_prng_descriptor.c', + 'src/misc/crypt/crypt_prng_is_valid.c', + 'src/misc/crypt/crypt_register_cipher.c', + 'src/misc/crypt/crypt_register_hash.c', + 'src/misc/crypt/crypt_register_prng.c', + 'src/misc/crypt/crypt_unregister_cipher.c', + 'src/misc/crypt/crypt_unregister_hash.c', + 'src/misc/crypt/crypt_unregister_prng.c', + 'src/misc/error_to_string.c', + 'src/misc/pkcs5/pkcs_5_1.c', + 'src/misc/pkcs5/pkcs_5_2.c', + 'src/misc/zeromem.c', + 'src/modes/cbc/cbc_decrypt.c', + 'src/modes/cbc/cbc_done.c', + 'src/modes/cbc/cbc_encrypt.c', + 'src/modes/cbc/cbc_getiv.c', + 'src/modes/cbc/cbc_setiv.c', + 'src/modes/cbc/cbc_start.c', + 'src/modes/cfb/cfb_decrypt.c', + 'src/modes/cfb/cfb_done.c', + 'src/modes/cfb/cfb_encrypt.c', + 'src/modes/cfb/cfb_getiv.c', + 'src/modes/cfb/cfb_setiv.c', + 'src/modes/cfb/cfb_start.c', + 'src/modes/ctr/ctr_decrypt.c', + 'src/modes/ctr/ctr_done.c', + 'src/modes/ctr/ctr_encrypt.c', + 'src/modes/ctr/ctr_getiv.c', + 'src/modes/ctr/ctr_setiv.c', + 'src/modes/ctr/ctr_start.c', + 'src/modes/ctr/ctr_test.c', + 'src/modes/ecb/ecb_decrypt.c', + 'src/modes/ecb/ecb_done.c', + 'src/modes/ecb/ecb_encrypt.c', + 'src/modes/ecb/ecb_start.c', + 'src/modes/ofb/ofb_decrypt.c', + 'src/modes/ofb/ofb_done.c', + 'src/pk/asn1/der/bit/der_decode_bit_string.c', + 'src/pk/asn1/der/bit/der_encode_bit_string.c', + 'src/pk/asn1/der/bit/der_length_bit_string.c', + 'src/pk/asn1/der/boolean/der_decode_boolean.c', + 'src/pk/asn1/der/boolean/der_encode_boolean.c', + 'src/pk/asn1/der/boolean/der_length_boolean.c', + 'src/pk/asn1/der/choice/der_decode_choice.c', + 'src/pk/asn1/der/ia5/der_decode_ia5_string.c', + 'src/pk/asn1/der/ia5/der_encode_ia5_string.c', + 'src/pk/asn1/der/ia5/der_length_ia5_string.c', + 'src/pk/asn1/der/integer/der_decode_integer.c', + 'src/pk/asn1/der/integer/der_encode_integer.c', + 'src/pk/asn1/der/integer/der_length_integer.c', + 'src/pk/asn1/der/object_identifier/der_decode_object_identifier.c', + 'src/pk/asn1/der/object_identifier/der_encode_object_identifier.c', + 'src/pk/asn1/der/object_identifier/der_length_object_identifier.c', + 'src/pk/asn1/der/octet/der_decode_octet_string.c', + 'src/pk/asn1/der/octet/der_encode_octet_string.c', + 'src/pk/asn1/der/octet/der_length_octet_string.c', + 'src/pk/asn1/der/printable_string/der_decode_printable_string.c', + 'src/pk/asn1/der/printable_string/der_encode_printable_string.c', + 'src/pk/asn1/der/printable_string/der_length_printable_string.c', + 'src/pk/asn1/der/sequence/der_decode_sequence_ex.c', + 'src/pk/asn1/der/sequence/der_decode_sequence_flexi.c', + 'src/pk/asn1/der/sequence/der_decode_sequence_multi.c', + 'src/pk/asn1/der/sequence/der_encode_sequence_ex.c', + 'src/pk/asn1/der/sequence/der_encode_sequence_multi.c', + 'src/pk/asn1/der/sequence/der_length_sequence.c', + 'src/pk/asn1/der/sequence/der_sequence_free.c', + 'src/pk/asn1/der/set/der_encode_set.c', + 'src/pk/asn1/der/set/der_encode_setof.c', + 'src/pk/asn1/der/short_integer/der_decode_short_integer.c', + 'src/pk/asn1/der/short_integer/der_encode_short_integer.c', + 'src/pk/asn1/der/short_integer/der_length_short_integer.c', + 'src/pk/asn1/der/utctime/der_decode_utctime.c', + 'src/pk/asn1/der/utctime/der_encode_utctime.c', + 'src/pk/asn1/der/utctime/der_length_utctime.c', + 'src/pk/asn1/der/utf8/der_decode_utf8_string.c', + 'src/pk/asn1/der/utf8/der_encode_utf8_string.c', + 'src/pk/asn1/der/utf8/der_length_utf8_string.c', + 'src/pk/dsa/dsa_decrypt_key.c', + 'src/pk/dsa/dsa_encrypt_key.c', + 'src/pk/dsa/dsa_export.c', + 'src/pk/dsa/dsa_free.c', + 'src/pk/dsa/dsa_import.c', + 'src/pk/dsa/dsa_make_key.c', + 'src/pk/dsa/dsa_shared_secret.c', + 'src/pk/dsa/dsa_sign_hash.c', + 'src/pk/dsa/dsa_verify_hash.c', + 'src/pk/dsa/dsa_verify_key.c', + 'src/pk/pkcs1/pkcs_1_i2osp.c', + 'src/pk/pkcs1/pkcs_1_mgf1.c', + 'src/pk/pkcs1/pkcs_1_oaep_decode.c', + 'src/pk/pkcs1/pkcs_1_oaep_encode.c', + 'src/pk/pkcs1/pkcs_1_os2ip.c', + 'src/pk/pkcs1/pkcs_1_pss_decode.c', + 'src/pk/pkcs1/pkcs_1_pss_encode.c', + 'src/pk/pkcs1/pkcs_1_v1_5_decode.c', + 'src/pk/pkcs1/pkcs_1_v1_5_encode.c', + 'src/pk/rsa/rsa_decrypt_key.c', + 'src/pk/rsa/rsa_encrypt_key.c', + 'src/pk/rsa/rsa_export.c', + 'src/pk/rsa/rsa_exptmod.c', + 'src/pk/rsa/rsa_free.c', + 'src/pk/rsa/rsa_import.c', + 'src/pk/rsa/rsa_make_key.c', + 'src/pk/rsa/rsa_sign_hash.c', + 'src/pk/rsa/rsa_verify_hash.c', + 'src/prngs/fortuna.c', + 'src/prngs/rng_get_bytes.c', + 'src/prngs/rng_make_prng.c', + 'src/prngs/sprng.c', + 'src/prngs/yarrow.c'], + CPPPATH=["src/headers"], CPPFLAGS=["-O3"]) +# DANGER: libtomcrypt won't compile without -O3 \ No newline at end of file diff --git a/stepmania/src/libtommath/SConscript b/stepmania/src/libtommath/SConscript new file mode 100644 index 0000000000..fa6fa87ca4 --- /dev/null +++ b/stepmania/src/libtommath/SConscript @@ -0,0 +1,39 @@ +StaticLibrary("tommath", ['bncore.c', 'bn_mp_init.c', 'bn_mp_clear.c', + 'bn_mp_exch.c', 'bn_mp_grow.c', 'bn_mp_shrink.c', 'bn_mp_clamp.c', + 'bn_mp_zero.c', 'bn_mp_set.c', 'bn_mp_set_int.c', 'bn_mp_init_size.c', + 'bn_mp_copy.c', 'bn_mp_init_copy.c', 'bn_mp_abs.c', 'bn_mp_neg.c', + 'bn_mp_cmp_mag.c', 'bn_mp_cmp.c', 'bn_mp_cmp_d.c', 'bn_mp_rshd.c', + 'bn_mp_lshd.c', 'bn_mp_mod_2d.c', 'bn_mp_div_2d.c', 'bn_mp_mul_2d.c', + 'bn_mp_div_2.c', 'bn_mp_mul_2.c', 'bn_s_mp_add.c', 'bn_s_mp_sub.c', + 'bn_fast_s_mp_mul_digs.c', 'bn_s_mp_mul_digs.c', + 'bn_fast_s_mp_mul_high_digs.c', 'bn_s_mp_mul_high_digs.c', + 'bn_fast_s_mp_sqr.c', 'bn_s_mp_sqr.c', 'bn_mp_add.c', 'bn_mp_sub.c', + 'bn_mp_karatsuba_mul.c', 'bn_mp_mul.c', 'bn_mp_karatsuba_sqr.c', + 'bn_mp_sqr.c', 'bn_mp_div.c', 'bn_mp_mod.c', 'bn_mp_add_d.c', + 'bn_mp_sub_d.c', 'bn_mp_mul_d.c', 'bn_mp_div_d.c', 'bn_mp_mod_d.c', + 'bn_mp_expt_d.c', 'bn_mp_addmod.c', 'bn_mp_submod.c', 'bn_mp_mulmod.c', + 'bn_mp_sqrmod.c', 'bn_mp_gcd.c', 'bn_mp_lcm.c', 'bn_fast_mp_invmod.c', + 'bn_mp_invmod.c', 'bn_mp_reduce.c', 'bn_mp_montgomery_setup.c', + 'bn_fast_mp_montgomery_reduce.c', 'bn_mp_montgomery_reduce.c', + 'bn_mp_exptmod_fast.c', 'bn_mp_exptmod.c', 'bn_mp_2expt.c', + 'bn_mp_n_root.c', 'bn_mp_jacobi.c', 'bn_reverse.c', 'bn_mp_count_bits.c', + 'bn_mp_read_unsigned_bin.c', 'bn_mp_read_signed_bin.c', + 'bn_mp_to_unsigned_bin.c', 'bn_mp_to_signed_bin.c', + 'bn_mp_unsigned_bin_size.c', 'bn_mp_signed_bin_size.c', 'bn_mp_xor.c', + 'bn_mp_and.c', 'bn_mp_or.c', 'bn_mp_rand.c', + 'bn_mp_montgomery_calc_normalization.c', 'bn_mp_prime_is_divisible.c', + 'bn_prime_tab.c', 'bn_mp_prime_fermat.c', 'bn_mp_prime_miller_rabin.c', + 'bn_mp_prime_is_prime.c', 'bn_mp_prime_next_prime.c', 'bn_mp_dr_reduce.c', + 'bn_mp_dr_is_modulus.c', 'bn_mp_dr_setup.c', 'bn_mp_reduce_setup.c', + 'bn_mp_toom_mul.c', 'bn_mp_toom_sqr.c', 'bn_mp_div_3.c', 'bn_s_mp_exptmod.c', + 'bn_mp_reduce_2k.c', 'bn_mp_reduce_is_2k.c', 'bn_mp_reduce_2k_setup.c', + 'bn_mp_reduce_2k_l.c', 'bn_mp_reduce_is_2k_l.c', 'bn_mp_reduce_2k_setup_l.c', + 'bn_mp_radix_smap.c', 'bn_mp_read_radix.c', 'bn_mp_toradix.c', + 'bn_mp_radix_size.c', 'bn_mp_fread.c', 'bn_mp_fwrite.c', 'bn_mp_cnt_lsb.c', + 'bn_error.c', 'bn_mp_init_multi.c', 'bn_mp_clear_multi.c', + 'bn_mp_exteuclid.c', 'bn_mp_toradix_n.c', 'bn_mp_prime_random_ex.c', + 'bn_mp_get_int.c', 'bn_mp_sqrt.c', 'bn_mp_is_square.c', 'bn_mp_init_set.c', + 'bn_mp_init_set_int.c', 'bn_mp_invmod_slow.c', + 'bn_mp_prime_rabin_miller_trials.c', 'bn_mp_to_signed_bin_n.c', + 'bn_mp_to_unsigned_bin_n.c'], + CPPPATH=["."]) \ No newline at end of file