Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

nirai: oh why did I do that?

Browse source
This commit is contained in:
Master Jumblespeed 2015-09-06 18:01:10 -04:00
parent 6cb6fd2fc7
commit 3959512782
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build/make.py
View file

@ -43,16 +43,16 @@ def niraicall_obfuscate(code):
niraimarshal.niraicall_obfuscate = niraicall_obfuscate niraimarshal.niraicall_obfuscate = niraicall_obfuscate
class StridePackager(NiraiPackager, configPath=None): class StridePackager(NiraiPackager):
HEADER = 'TTSTRIDE' HEADER = 'TTSTRIDE'
BASEDIR = '..' + os.sep BASEDIR = '..' + os.sep
def __init__(self, outfile): def __init__(self, outfile, configPath=None):
NiraiPackager.__init__(self, outfile) NiraiPackager.__init__(self, outfile)
self.__manglebase = self.get_mangle_base(self.BASEDIR) self.__manglebase = self.get_mangle_base(self.BASEDIR)
self.add_panda3d_dirs() self.add_panda3d_dirs()
self.add_default_lib() self.add_default_lib()
self.globalConfigPath = configPath if configPath is not None else '../dependencies/config/release/qa.prc' self.globalConfigPath = configPath
def add_source_dir(self, dir): def add_source_dir(self, dir):
self.add_directory(self.BASEDIR + dir, mangler=self.__mangler) self.add_directory(self.BASEDIR + dir, mangler=self.__mangler)
@ -71,8 +71,11 @@ class StridePackager(NiraiPackager, configPath=None):
def generate_niraidata(self): def generate_niraidata(self):
print 'Generating niraidata' print 'Generating niraidata'
config = self.get_file_contents('../dependencies/config/general.prc') if self.globalConfigPath is not None:
config += '\n\n' + self.get_file_contents(self.globalConfigPath) config = self.get_file_contents(self.globalConfigPath)
else:
config = self.get_file_contents('../dependencies/config/general.prc')
config += '\n\n' + self.get_file_contents('../dependencies/config/release/qa.prc')
config_iv = self.generate_key(16) config_iv = self.generate_key(16)
config_key = self.generate_key(16) config_key = self.generate_key(16)

2
build/nirai/panda3d

@ -1 +1 @@
Subproject commit 510b6b2b3fef1674611e4666b45db949868a8869 Subproject commit e4743737b0572feab80a08959f2b4d865ab3bc62

2
build/nirai/src

@ -1 +1 @@
Subproject commit 936977760bfac218f634533dd4d926ad7e8e2092 Subproject commit 3d29188a91b658f61cd2c3b3b8ada23050d4f230