diff --git a/.hgignore b/.hgignore new file mode 100644 --- /dev/null +++ b/.hgignore @@ -0,0 +1,5 @@ +syntax: glob + +win\.vs +win\x64Debug +*.user \ No newline at end of file diff --git a/win/MyenergiCapture.sln b/win/MyenergiCapture.sln --- a/win/MyenergiCapture.sln +++ b/win/MyenergiCapture.sln @@ -1,35 +1,35 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.32510.428 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MyenergiCapture", "MyenergiCapture.vcxproj", "{28000ACC-67F6-4A82-B779-A24F065FACF4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lgi", "..\lgi\trunk\win\Lgi_vs2019.vcxproj", "{95DF9CA4-6D37-4A85-A648-80C2712E0DA1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lgi", "..\..\lgi\trunk\win\Lgi_vs2019.vcxproj", "{95DF9CA4-6D37-4A85-A648-80C2712E0DA1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 Release|x64 = Release|x64 ReleaseNoOptimize|x64 = ReleaseNoOptimize|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {28000ACC-67F6-4A82-B779-A24F065FACF4}.Debug|x64.ActiveCfg = Debug|x64 {28000ACC-67F6-4A82-B779-A24F065FACF4}.Debug|x64.Build.0 = Debug|x64 {28000ACC-67F6-4A82-B779-A24F065FACF4}.Release|x64.ActiveCfg = Release|x64 {28000ACC-67F6-4A82-B779-A24F065FACF4}.Release|x64.Build.0 = Release|x64 {28000ACC-67F6-4A82-B779-A24F065FACF4}.ReleaseNoOptimize|x64.ActiveCfg = Release|x64 {28000ACC-67F6-4A82-B779-A24F065FACF4}.ReleaseNoOptimize|x64.Build.0 = Release|x64 {95DF9CA4-6D37-4A85-A648-80C2712E0DA1}.Debug|x64.ActiveCfg = Debug|x64 {95DF9CA4-6D37-4A85-A648-80C2712E0DA1}.Debug|x64.Build.0 = Debug|x64 {95DF9CA4-6D37-4A85-A648-80C2712E0DA1}.Release|x64.ActiveCfg = Release|x64 {95DF9CA4-6D37-4A85-A648-80C2712E0DA1}.Release|x64.Build.0 = Release|x64 {95DF9CA4-6D37-4A85-A648-80C2712E0DA1}.ReleaseNoOptimize|x64.ActiveCfg = ReleaseNoOptimize|x64 {95DF9CA4-6D37-4A85-A648-80C2712E0DA1}.ReleaseNoOptimize|x64.Build.0 = ReleaseNoOptimize|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8AFA015A-9E85-49DE-AE76-A301113E41D7} EndGlobalSection EndGlobal diff --git a/win/MyenergiCapture.vcxproj b/win/MyenergiCapture.vcxproj --- a/win/MyenergiCapture.vcxproj +++ b/win/MyenergiCapture.vcxproj @@ -1,189 +1,189 @@ Debug Win32 Debug x64 Release Win32 Release x64 {28000ACC-67F6-4A82-B779-A24F065FACF4} Template Win32Proj 10.0 Application v142 Unicode true Application v142 Unicode true Application v142 Unicode Application v142 Unicode <_ProjectFileVersion>12.0.30501.0 $(Platform)$(Configuration)\ $(Platform)$(Configuration)\ true $(Platform)$(Configuration)\ $(Platform)$(Configuration)\ true $(Platform)$(Configuration)\ $(Platform)$(Configuration)\ false $(Platform)$(Configuration)\ $(Platform)$(Configuration)\ false Disabled - ..\lgi\trunk\include;..\lgi\trunk\include\lgi\win;%(AdditionalIncludeDirectories) + ..\..\lgi\trunk\include;..\..\lgi\trunk\include\lgi\win;%(AdditionalIncludeDirectories) WIN32;_DEBUG;WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL Level3 ProgramDatabase imm32.lib;Ws2_32.lib;%(AdditionalDependencies) true Windows false MachineX86 Disabled - ..\lgi\trunk\include;..\lgi\trunk\include\lgi\win;.\npcap-sdk-1.13\Include;%(AdditionalIncludeDirectories) + ..\resources;..\..\lgi\trunk\include;..\..\lgi\trunk\include\lgi\win;..\npcap-sdk-1.13\Include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;WINDOWS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 ProgramDatabase imm32.lib;Ws2_32.lib;%(AdditionalDependencies) true Windows false - .\npcap-sdk-1.13\Lib\x64;%(AdditionalLibraryDirectories) + ..\npcap-sdk-1.13\Lib\x64;%(AdditionalLibraryDirectories) - ..\lgi\trunk\include;..\lgi\trunk\include\lgi\win;%(AdditionalIncludeDirectories) + ..\..\lgi\trunk\include;..\..\lgi\trunk\include\lgi\win;%(AdditionalIncludeDirectories) WIN32;NDEBUG;WINDOWS;%(PreprocessorDefinitions) MultiThreadedDLL Level3 ProgramDatabase imm32.lib;Ws2_32.lib;%(AdditionalDependencies) true Windows true true false MachineX86 - ..\lgi\trunk\include;..\lgi\trunk\include\lgi\win;.\npcap-sdk-1.13\Include;%(AdditionalIncludeDirectories) + ..\resources;..\..\lgi\trunk\include;..\..\lgi\trunk\include\lgi\win;..\npcap-sdk-1.13\Include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;WINDOWS;%(PreprocessorDefinitions) MultiThreadedDLL Level3 ProgramDatabase imm32.lib;Ws2_32.lib;%(AdditionalDependencies) true Windows true true false - .\npcap-sdk-1.13\Lib\x64;%(AdditionalLibraryDirectories) + ..\npcap-sdk-1.13\Lib\x64;%(AdditionalLibraryDirectories) - - + + - + - + {95df9ca4-6d37-4a85-a648-80c2712e0da1} \ No newline at end of file diff --git a/win/MyenergiCapture.vcxproj.filters b/win/MyenergiCapture.vcxproj.filters --- a/win/MyenergiCapture.vcxproj.filters +++ b/win/MyenergiCapture.vcxproj.filters @@ -1,23 +1,23 @@  {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx {6f28295e-a158-4b45-89e6-9182d0815dab} - + Source Files - - Source Files\Lgi + + Source Files - + \ No newline at end of file