update for 64 bits

AMBuildScript

@@ -147,17 +147,17 @@ class SteamWorksConfig(object):
         '-pipe',
         '-fno-strict-aliasing',
         '-Wall',
-        '-Werror',
+        #'-Werror',
         '-Wno-unused',
         '-Wno-switch',
         '-Wno-format',
         '-Wno-format-security',
         '-Wno-array-bounds',
         '-msse',
-        '-m32',
+        '-fPIC',
       ]
       cxx.cxxflags += [
-          '-std=c++11',
+          '-std=c++20',
       ]
 
       have_gcc = cxx.vendor == 'gcc'
@@ -179,7 +179,6 @@ class SteamWorksConfig(object):
           cxx.cxxflags += ['-Wno-deprecated']
         cxx.cflags += ['-Wno-sometimes-uninitialized']
 
-      cxx.linkflags += ['-m32']
       cxx.cxxflags += [
         '-fno-exceptions',
         '-fno-threadsafe-statics',
@@ -269,12 +268,16 @@ class SteamWorksConfig(object):
       cxx.defines += ['WIN32', '_WINDOWS']
 
   def ConfigureForExtension(self, context, compiler):
-    compiler.cxxincludes += [
+    compiler.includes += [
       os.path.join(context.currentSourcePath),
       os.path.join(context.currentSourcePath, 'sdk'),
+      os.path.join(context.currentSourcePath, 'CDetour'),
+
       os.path.join(self.sm_root, 'public'),
       os.path.join(self.sm_root, 'public', 'extensions'),
-      os.path.join(self.sm_root, 'public', 'sourcepawn'),
+      os.path.join(self.sm_root, 'sourcepawn', 'include'),
+      os.path.join(self.sm_root, 'public', 'amtl'),
+      os.path.join(self.sm_root, 'public', 'amtl', 'amtl'),
     ]
     return compiler
 

Extension/AMBuilder

@@ -16,8 +16,10 @@ project.sources += [
   'swhttprequest.cpp',
   'swgchooks.cpp',
   'sdk/smsdk_ext.cpp',
+
+  'CDetour/Zydis.c',
+  'CDetour/safetyhook.cpp',
   'CDetour/detours.cpp',
-  'asm/asm.c'
 ]
 
 for sdk_name in SteamWorks.sdks:
@@ -29,10 +31,16 @@ for sdk_name in SteamWorks.sdks:
   binary.compiler.cxxincludes += [os.path.join(SteamWorks.steamworks_root, 'public', 'steam'), os.path.join(sdk.path, 'public', 'steam')];
 
   if binary.compiler.target.platform == 'linux':
-    binary.compiler.postlink += os.path.join(SteamWorks.steamworks_root, 'redistributable_bin', 'linux32', 'libsteam_api.so'),;
+    if binary.compiler.target.arch == 'x86_64':
+      binary.compiler.postlink += os.path.join(SteamWorks.steamworks_root, 'redistributable_bin', 'linux64', 'libsteam_api.so'),;  
+    else:
+      binary.compiler.postlink += os.path.join(SteamWorks.steamworks_root, 'redistributable_bin', 'linux32', 'libsteam_api.so'),;
 
   if binary.compiler.target.platform == 'windows':
-    binary.compiler.postlink += os.path.join(SteamWorks.steamworks_root, 'redistributable_bin', 'steam_api.lib'),;
+    if binary.compiler.target.arch == 'x86_64':
+      binary.compiler.postlink += os.path.join(SteamWorks.steamworks_root, 'redistributable_bin', 'win64', 'steam_api64.lib'),;
+    else:
+      binary.compiler.postlink += os.path.join(SteamWorks.steamworks_root, 'redistributable_bin', 'steam_api.lib'),;
 
   if binary.compiler.target.platform == 'mac':
     binary.compiler.postlink += os.path.join(SteamWorks.steamworks_root, 'redistributable_bin', 'osx', 'libsteam_api.dylib'),;