source/sourcemod
1
0
Fork 0
mirror of https://github.com/alliedmodders/sourcemod.git synced 2025-12-07 02:18:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch to MYSQLC/_64 env var and update messages to note usage of Connector/C.

Browse Source
This commit is contained in:
Nicholas Hastings 2018-02-25 14:56:32 -05:00
parent f3319ccc82
commit 95100c486e
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AMBuildScript
View File

@ -182,12 +182,9 @@ class SMConfig(object):
if builder.options.mysql_path:
self.mysql_root['x86'] = builder.options.mysql_path
else:
for i in range(7):
self.mysql_root['x86'] = ResolveEnvPath('MYSQL5', 'mysql-5.' + str(i))
if self.mysql_root['x86']:
break
self.mysql_root['x86'] = ResolveEnvPath('MYSQLC', 'mysql-connector-c'
if not self.mysql_root['x86'] or not os.path.isdir(self.mysql_root['x86']):
raise Exception('Could not find a path to MySQL!')
raise Exception('Could not find a path to MySQL Connector/C!')
self.mysql_root['x86'] = Normalize(self.mysql_root['x86'])
# For now, ignore 64-bit MySQL on Windows
@ -195,12 +192,11 @@ class SMConfig(object):
if builder.options.mysql_path:
self.mysql_root['x64'] = builder.options.mysql64_path
else:
for i in range(7):
self.mysql_root['x64'] = ResolveEnvPath('MYSQL5_64', 'mysql-5.' + str(i) + '-x86_64')
self.mysql_root['x64'] = ResolveEnvPath('MYSQLC_64', 'mysql-connector-c-x86_64')
if self.mysql_root['x64']:
break
if not self.mysql_root['x64'] or not os.path.isdir(self.mysql_root['x64']):
raise Exception('Could not find a path to 64-bit MySQL!')
raise Exception('Could not find a path to 64-bit MySQL Connector/C!')
self.mysql_root['x64'] = Normalize(self.mysql_root['x64'])
def configure(self):

4
configure.py
View File

@ -21,9 +21,9 @@ parser.default_build_folder = make_objdir_name
parser.options.add_option('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None,
help='Root search folder for HL2SDKs')
parser.options.add_option('--mysql-path', type=str, dest='mysql_path', default=None,
help='Path to MySQL 5')
help='Path to MySQL Connector/C')
parser.options.add_option('--mysql64-path', type=str, dest='mysql64_path', default=None,
help='Path to 64-bit MySQL 5')
help='Path to 64-bit Connector/C')
parser.options.add_option('--mms-path', type=str, dest='mms_path', default=None,
help='Path to Metamod:Source')
parser.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',