diff --git a/.gitignore b/.gitignore index 55ea33d..f84323d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ [Dd]ebug/ [Rr]elease/ x64/ +Win32/ build/ [Bb]in/ [Oo]bj/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..6db9806 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "scylla_wrapper_dll"] + path = scylla_wrapper_dll + url = https://bitbucket.org/cypherpunk/scylla_wrapper_dll diff --git a/TitanEngine.sln b/TitanEngine.sln index 8b4e093..20ab757 100644 --- a/TitanEngine.sln +++ b/TitanEngine.sln @@ -2,6 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TitanEngine", "TitanEngine\TitanEngine.vcxproj", "{9C7B8246-FDDA-48C7-9634-044969701E40}" + ProjectSection(ProjectDependencies) = postProject + {F874B1B3-8EF7-4DF1-9889-57098E08A51C} = {F874B1B3-8EF7-4DF1-9889-57098E08A51C} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scylla_wrapper", "scylla_wrapper_dll\scylla_wrapper\scylla_wrapper.vcxproj", "{F874B1B3-8EF7-4DF1-9889-57098E08A51C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,8 +24,19 @@ Global {9C7B8246-FDDA-48C7-9634-044969701E40}.Release|Win32.Build.0 = Release|Win32 {9C7B8246-FDDA-48C7-9634-044969701E40}.Release|x64.ActiveCfg = Release|x64 {9C7B8246-FDDA-48C7-9634-044969701E40}.Release|x64.Build.0 = Release|x64 + {F874B1B3-8EF7-4DF1-9889-57098E08A51C}.Debug|Win32.ActiveCfg = Release-Lib|Win32 + {F874B1B3-8EF7-4DF1-9889-57098E08A51C}.Debug|Win32.Build.0 = Release-Lib|Win32 + {F874B1B3-8EF7-4DF1-9889-57098E08A51C}.Debug|x64.ActiveCfg = Release-Lib|x64 + {F874B1B3-8EF7-4DF1-9889-57098E08A51C}.Debug|x64.Build.0 = Release-Lib|x64 + {F874B1B3-8EF7-4DF1-9889-57098E08A51C}.Release|Win32.ActiveCfg = Release-Lib|Win32 + {F874B1B3-8EF7-4DF1-9889-57098E08A51C}.Release|Win32.Build.0 = Release-Lib|Win32 + {F874B1B3-8EF7-4DF1-9889-57098E08A51C}.Release|x64.ActiveCfg = Release-Lib|x64 + {F874B1B3-8EF7-4DF1-9889-57098E08A51C}.Release|x64.Build.0 = Release-Lib|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {6AD826EE-00F0-410E-9586-2B4EC239DC9E} + EndGlobalSection EndGlobal diff --git a/TitanEngine/TitanEngine.vcxproj b/TitanEngine/TitanEngine.vcxproj index 3308f83..1b91780 100644 --- a/TitanEngine/TitanEngine.vcxproj +++ b/TitanEngine/TitanEngine.vcxproj @@ -107,7 +107,7 @@ true - $(ProjectDir)ntdll_x86.lib;$(ProjectDir)scylla_wrapper_x86.lib;$(ProjectDir)distorm_x86.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies) + $(ProjectDir)ntdll_x86.lib;$(SolutionDir)$(Platform)\Release-Lib\scylla_wrapper_x86.lib;$(ProjectDir)distorm_x86.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies) $(ProjectDir)TitanEngine.def true UseLinkTimeCodeGeneration @@ -136,7 +136,7 @@ Sync - $(ProjectDir)ntdll_x86.lib;$(ProjectDir)scylla_wrapper_x86.lib;$(ProjectDir)distorm_x86.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies) + $(ProjectDir)ntdll_x86.lib;$(SolutionDir)$(Platform)\Release-Lib\scylla_wrapper_x86.lib;$(ProjectDir)distorm_x86.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies) $(ProjectDir)TitanEngine.def true UseLinkTimeCodeGeneration @@ -165,7 +165,7 @@ true - $(ProjectDir)ntdll_x64.lib;$(ProjectDir)scylla_wrapper_x64.lib;$(ProjectDir)distorm_x64.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies) + $(ProjectDir)ntdll_x64.lib;$(SolutionDir)$(Platform)\Release-Lib\scylla_wrapper_x64.lib;$(ProjectDir)distorm_x64.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies) $(OutDir)TitanEngine.dll false $(ProjectDir)TitanEngine.def @@ -203,7 +203,7 @@ false - $(ProjectDir)ntdll_x64.lib;$(ProjectDir)scylla_wrapper_x64.lib;$(ProjectDir)distorm_x64.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies) + $(ProjectDir)ntdll_x64.lib;$(SolutionDir)$(Platform)\Release-Lib\scylla_wrapper_x64.lib;$(ProjectDir)distorm_x64.lib;Imagehlp.lib;psapi.lib;%(AdditionalDependencies) $(OutDir)TitanEngine.dll false $(ProjectDir)TitanEngine.def diff --git a/TitanEngine/scylla_wrapper_x64.lib b/TitanEngine/scylla_wrapper_x64.lib deleted file mode 100644 index 1ddf791..0000000 Binary files a/TitanEngine/scylla_wrapper_x64.lib and /dev/null differ diff --git a/TitanEngine/scylla_wrapper_x86.lib b/TitanEngine/scylla_wrapper_x86.lib deleted file mode 100644 index 8285835..0000000 Binary files a/TitanEngine/scylla_wrapper_x86.lib and /dev/null differ diff --git a/scylla_wrapper_dll b/scylla_wrapper_dll new file mode 160000 index 0000000..4ad953e --- /dev/null +++ b/scylla_wrapper_dll @@ -0,0 +1 @@ +Subproject commit 4ad953ec04108269f1d80a91b2723b3e22d1b4d2