1.1 --- a/core/AMBuilder Sun Feb 09 19:38:41 2014 -0500
1.2 +++ b/core/AMBuilder Sun Feb 09 22:50:20 2014 -0600
1.3 @@ -8,16 +8,16 @@
1.4 binary = SM.HL2Library(builder, binary_name, sdk)
1.5 compiler = binary.compiler
1.6
1.7 - if sdk.name is 'csgo':
1.8 + if sdk.name == 'csgo':
1.9 # Protobuf 2.3 headers have some signed/unsigned compares. I believe that it's fixed in later versions, but Valve.
1.10 - if compiler.cxx.behavior is 'gcc':
1.11 + if compiler.cxx.behavior == 'gcc':
1.12 compiler.cflags += ['-Wno-sign-compare']
1.13 compiler.cxxincludes += [
1.14 os.path.join(sdk.path, 'common', 'protobuf-2.3.0', 'src'),
1.15 os.path.join(sdk.path, 'public', 'engine', 'protobuf'),
1.16 os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf')
1.17 ]
1.18 - elif sdk.name is 'dota':
1.19 + elif sdk.name == 'dota':
1.20 compiler.cxxincludes += [
1.21 os.path.join(sdk.path, 'common', 'protobuf-2.4.1', 'src'),
1.22 os.path.join(sdk.path, 'public', 'engine', 'protobuf'),
1.23 @@ -25,15 +25,15 @@
1.24 os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf')
1.25 ]
1.26
1.27 - if builder.target_platform is 'linux':
1.28 + if builder.target_platform == 'linux':
1.29 compiler.postlink += ['-lpthread', '-lrt']
1.30
1.31 - if sdk.name is 'csgo' or sdk.name is 'dota':
1.32 - if builder.target_platform is 'linux':
1.33 + if sdk.name == 'csgo' or sdk.name == 'dota':
1.34 + if builder.target_platform == 'linux':
1.35 lib_path = os.path.join(sdk.path, 'lib', 'linux32', 'release', 'libprotobuf.a')
1.36 - elif builder.target_platform is 'mac':
1.37 + elif builder.target_platform == 'mac':
1.38 lib_path = os.path.join(sdk.path, 'lib', 'osx32', 'release', 'libprotobuf.a')
1.39 - elif builder.target_platform is 'windows':
1.40 + elif builder.target_platform == 'windows':
1.41 if 'DEBUG' in compiler.defines:
1.42 lib_path = os.path.join(sdk.path, 'lib', 'win32', 'debug', 'vs2010', 'libprotobuf.lib')
1.43 else:
1.44 @@ -89,13 +89,13 @@
1.45 else:
1.46 binary.sources += ['smn_bitbuffer.cpp']
1.47
1.48 - if sdk.name is 'csgo':
1.49 + if sdk.name == 'csgo':
1.50 binary.sources += [
1.51 os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'netmessages.pb.cc'),
1.52 os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessages.pb.cc'),
1.53 os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessage_helpers.cpp'),
1.54 ]
1.55 - elif sdk.name is 'dota':
1.56 + elif sdk.name == 'dota':
1.57 binary.sources += [
1.58 os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'networkbasetypes.pb.cc'),
1.59 os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'netmessages.pb.cc'),