diff --git a/AMBuildScript b/AMBuildScript index 99adb3d..c6ffc85 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -348,7 +348,7 @@ globals = { #AMBuild.Include(os.path.join('buildbot', 'Versioning'), globals) FileList = [ - ['AMBuilder'], + ['extension', 'AMBuilder'], ['buildbot', 'PackageScript'] ] diff --git a/build.py b/build.py deleted file mode 100644 index 6734248..0000000 --- a/build.py +++ /dev/null @@ -1,10 +0,0 @@ - -# vim: set ts=2 sw=2 tw=99 noet: -import sys -import ambuild.runner as runner - -run = runner.Runner() -run.options.usage = '%prog [options] [job list]' -run.options.add_option('-l', '--list-jobs', action='store_true', dest='list', help='print list of jobs') -run.Build() - \ No newline at end of file diff --git a/AMBuilder b/extension/AMBuilder similarity index 68% rename from AMBuilder rename to extension/AMBuilder index 4ae79e7..402b929 100644 --- a/AMBuilder +++ b/extension/AMBuilder @@ -6,11 +6,14 @@ for i in SM.sdkInfo: if AMBuild.target['platform'] not in sdk['platform']: continue - compiler = SM.DefaultHL2Compiler('', i) + compiler = SM.DefaultHL2Compiler('extension', i) + + compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'extension')) + compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'extension', 'sdk')) + compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD14'], 'public')) + compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD14'], 'extensions')) compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD14'], 'public', 'sourcepawn')) - #compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD14'], 'public', 'jit')) - #compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD14'], 'public', 'jit', 'x86')) if compiler.cc.name == 'gcc': compiler['CFLAGS'].append('-Wno-parentheses') @@ -22,7 +25,7 @@ for i in SM.sdkInfo: extension = AMBuild.AddJob(name) binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler) SM.PreSetupHL2Job(extension, binary, i) - binary.AddSourceFiles('', [ + binary.AddSourceFiles('extension', [ 'extension.cpp', 'asm/asm.c', 'CDetour/detours.cpp', @@ -30,5 +33,6 @@ for i in SM.sdkInfo: ]) SM.PostSetupHL2Job(extension, binary, i) #SM.AutoVersion('extension', binary) + #SM.ExtractDebugInfo(extension, binary) binary.SendToJob() diff --git a/CDetour/detourhelpers.h b/extension/CDetour/detourhelpers.h similarity index 100% rename from CDetour/detourhelpers.h rename to extension/CDetour/detourhelpers.h diff --git a/CDetour/detours.cpp b/extension/CDetour/detours.cpp similarity index 100% rename from CDetour/detours.cpp rename to extension/CDetour/detours.cpp diff --git a/CDetour/detours.h b/extension/CDetour/detours.h similarity index 100% rename from CDetour/detours.h rename to extension/CDetour/detours.h diff --git a/asm/asm.c b/extension/asm/asm.c similarity index 100% rename from asm/asm.c rename to extension/asm/asm.c diff --git a/asm/asm.h b/extension/asm/asm.h similarity index 100% rename from asm/asm.h rename to extension/asm/asm.h diff --git a/extension.cpp b/extension/extension.cpp similarity index 100% rename from extension.cpp rename to extension/extension.cpp diff --git a/extension.hpp b/extension/extension.hpp similarity index 100% rename from extension.hpp rename to extension/extension.hpp diff --git a/sdk/smsdk_config.hpp b/extension/sdk/smsdk_config.hpp similarity index 100% rename from sdk/smsdk_config.hpp rename to extension/sdk/smsdk_config.hpp diff --git a/sdk/smsdk_ext.cpp b/extension/sdk/smsdk_ext.cpp similarity index 100% rename from sdk/smsdk_ext.cpp rename to extension/sdk/smsdk_ext.cpp diff --git a/sdk/smsdk_ext.hpp b/extension/sdk/smsdk_ext.hpp similarity index 100% rename from sdk/smsdk_ext.hpp rename to extension/sdk/smsdk_ext.hpp diff --git a/msvc10/connect.sln b/msvc10/connect.sln deleted file mode 100644 index 3a23d46..0000000 --- a/msvc10/connect.sln +++ /dev/null @@ -1,23 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "connect", "connect.vcxproj", "{B3E797CF-4E77-4C9D-B8A8-7589B6902206}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug - Orange Box Valve|Win32 = Debug - Orange Box Valve|Win32 - Release - Orange Box Valve|Win32 = Release - Orange Box Valve|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box Valve|Win32.ActiveCfg = Debug - Orange Box Valve|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box Valve|Win32.Build.0 = Debug - Orange Box Valve|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box Valve|Win32.ActiveCfg = Release - Orange Box Valve|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box Valve|Win32.Build.0 = Release - Orange Box Valve|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - VisualSVNWorkingCopyRoot = .. - EndGlobalSection -EndGlobal diff --git a/msvc10/connect.vcxproj b/msvc10/connect.vcxproj deleted file mode 100644 index 7ff27e3..0000000 --- a/msvc10/connect.vcxproj +++ /dev/null @@ -1,133 +0,0 @@ - - - - - Debug - Orange Box Valve - Win32 - - - Release - Orange Box Valve - Win32 - - - - {B3E797CF-4E77-4C9D-B8A8-7589B6902206} - tf2items - Win32Proj - connect - - - - DynamicLibrary - MultiByte - true - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - false - $(ProjectName).ext.2.ep2v - $(ProjectName).ext.2.ep2v - - - - /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) - Disabled - ..;..\sdk;$(SOURCEMOD13)\public\;$(SOURCEMOD13)\public\sourcepawn\;$(HL2SDKOBVALVE)\game\shared\;$(HL2SDKOBVALVE)\game\server\;$(HL2SDKOBVALVE)\public;$(HL2SDKOBVALVE)\public\engine;$(HL2SDKOBVALVE)\public\game\server;$(HL2SDKOBVALVE)\public\tier0;$(HL2SDKOBVALVE)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=4;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - NotSet - false - - - Level3 - EditAndContinue - false - - - $(HL2SDKOBVALVE)\lib\public\tier0.lib;$(HL2SDKOBVALVE)\lib\public\tier1.lib;$(HL2SDKOBVALVE)\lib\public\vstdlib.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).ext.2.ep2v.dll - LIBC;LIBCD;LIBCMT;%(IgnoreSpecificDefaultLibraries) - true - Windows - false - - - MachineX86 - - - - - /MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) - Speed - ..;..\sdk;$(SOURCEMOD13)\public\;$(SOURCEMOD13)\public\sourcepawn\;$(HL2SDKOBVALVE)\game\shared\;$(HL2SDKOBVALVE)\game\server\;$(HL2SDKOBVALVE)\public;$(HL2SDKOBVALVE)\public\engine;$(HL2SDKOBVALVE)\public\game\server;$(HL2SDKOBVALVE)\public\tier0;$(HL2SDKOBVALVE)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=4;%(PreprocessorDefinitions) - MultiThreaded - NotSet - false - - - Level3 - true - ProgramDatabase - - - $(HL2SDKOBVALVE)\lib\public\tier0.lib;$(HL2SDKOBVALVE)\lib\public\tier1.lib;$(HL2SDKOBVALVE)\lib\public\vstdlib.lib;%(AdditionalDependencies) - LinkVerbose - $(OutDir)$(ProjectName).ext.2.ep2v.dll - LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries) - true - Windows - true - true - false - - - MachineX86 - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/msvc10/connect.vcxproj.filters b/msvc10/connect.vcxproj.filters deleted file mode 100644 index 20ebd71..0000000 --- a/msvc10/connect.vcxproj.filters +++ /dev/null @@ -1,50 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {31958233-BB2D-4e41-A8F9-CE8A4684F436} - - - - - Source Files - - - SourceMod SDK - - - Source Files - - - Source Files - - - - - Header Files - - - SourceMod SDK - - - SourceMod SDK - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/msvc10/connect.vcxproj.user b/msvc10/connect.vcxproj.user deleted file mode 100644 index 695b5c7..0000000 --- a/msvc10/connect.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file