From 1c24265001a2db4989e1fafd6598dfe3a0e93564 Mon Sep 17 00:00:00 2001 From: Tim Hughes Date: Sat, 3 May 2014 20:56:22 +0100 Subject: [PATCH] Fixed neth and added project to solution (also renamed Ethereum.vcxproj to Eth.vcxproj). --- neth/main.cpp | 15 +- windows/{Ethereum.vcxproj => Eth.vcxproj} | 9 +- windows/Ethereum.sln | 30 ++- windows/Neth.vcxproj | 213 ++++++++++++++++++++++ 4 files changed, 244 insertions(+), 23 deletions(-) rename windows/{Ethereum.vcxproj => Eth.vcxproj} (97%) create mode 100644 windows/Neth.vcxproj diff --git a/neth/main.cpp b/neth/main.cpp index 932be4c00..fa9c5bcd1 100644 --- a/neth/main.cpp +++ b/neth/main.cpp @@ -20,10 +20,6 @@ * Ethereum client. */ -#include -#undef OK -#include -#undef OK #include #include #include @@ -38,6 +34,13 @@ #include #include #include "BuildInfo.h" + +#undef KEY_EVENT // from windows.h +#include +#undef OK +#include +#undef OK + using namespace std; using namespace eth; using namespace boost::algorithm; @@ -962,7 +965,7 @@ vector form_dialog(vector _sv, vector _lv, vector field(maxfields); int ch; int starty = 6; int height = _cols; @@ -1000,7 +1003,7 @@ vector form_dialog(vector _sv, vector _lv, vector Win32Proj Ethereum - Ethereum + eth {C60C065C-2135-4B2B-AFD4-35FD7AC56B40} @@ -71,18 +71,13 @@ true - eth - - - eth + false - eth false - eth diff --git a/windows/Ethereum.sln b/windows/Ethereum.sln index c87000e90..e968f32c0 100644 --- a/windows/Ethereum.sln +++ b/windows/Ethereum.sln @@ -13,8 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibLevelDB", "LibLevelDB.vc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSecp256k1", "LibSecp256k1.vcxproj", "{1E1175BB-C4A9-41D8-B2D1-9022F71D3CEA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ethereum", "Ethereum.vcxproj", "{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSecp256k1", "TestSecp256k1.vcxproj", "{3BF049F8-AF7E-4E1C-9627-3E94C887AF24}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestEthereum", "TestEthereum.vcxproj", "{3F3E389B-88DE-41D5-A73B-4F6036E18B36}" @@ -31,6 +29,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibQEthereum", "LibQEthereu EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibEthCore", "LibEthCore.vcxproj", "{22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Eth", "Eth.vcxproj", "{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Neth", "Neth.vcxproj", "{90C70663-7181-4E99-9079-54188CEB8954}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -63,14 +65,6 @@ Global {1E1175BB-C4A9-41D8-B2D1-9022F71D3CEA}.Release|Win32.Build.0 = Release|Win32 {1E1175BB-C4A9-41D8-B2D1-9022F71D3CEA}.Release|x64.ActiveCfg = Release|x64 {1E1175BB-C4A9-41D8-B2D1-9022F71D3CEA}.Release|x64.Build.0 = Release|x64 - {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|Win32.ActiveCfg = Debug|Win32 - {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|Win32.Build.0 = Debug|Win32 - {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|x64.ActiveCfg = Debug|x64 - {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|x64.Build.0 = Debug|x64 - {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Release|Win32.ActiveCfg = Release|Win32 - {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Release|Win32.Build.0 = Release|Win32 - {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Release|x64.ActiveCfg = Release|x64 - {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Release|x64.Build.0 = Release|x64 {3BF049F8-AF7E-4E1C-9627-3E94C887AF24}.Debug|Win32.ActiveCfg = Debug|Win32 {3BF049F8-AF7E-4E1C-9627-3E94C887AF24}.Debug|Win32.Build.0 = Debug|Win32 {3BF049F8-AF7E-4E1C-9627-3E94C887AF24}.Debug|x64.ActiveCfg = Debug|x64 @@ -135,6 +129,22 @@ Global {22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}.Release|Win32.Build.0 = Release|Win32 {22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}.Release|x64.ActiveCfg = Release|x64 {22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}.Release|x64.Build.0 = Release|x64 + {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|Win32.ActiveCfg = Debug|Win32 + {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|Win32.Build.0 = Debug|Win32 + {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|x64.ActiveCfg = Debug|x64 + {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|x64.Build.0 = Debug|x64 + {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Release|Win32.ActiveCfg = Release|Win32 + {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Release|Win32.Build.0 = Release|Win32 + {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Release|x64.ActiveCfg = Release|x64 + {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Release|x64.Build.0 = Release|x64 + {90C70663-7181-4E99-9079-54188CEB8954}.Debug|Win32.ActiveCfg = Debug|Win32 + {90C70663-7181-4E99-9079-54188CEB8954}.Debug|Win32.Build.0 = Debug|Win32 + {90C70663-7181-4E99-9079-54188CEB8954}.Debug|x64.ActiveCfg = Debug|x64 + {90C70663-7181-4E99-9079-54188CEB8954}.Debug|x64.Build.0 = Debug|x64 + {90C70663-7181-4E99-9079-54188CEB8954}.Release|Win32.ActiveCfg = Release|Win32 + {90C70663-7181-4E99-9079-54188CEB8954}.Release|Win32.Build.0 = Release|Win32 + {90C70663-7181-4E99-9079-54188CEB8954}.Release|x64.ActiveCfg = Release|x64 + {90C70663-7181-4E99-9079-54188CEB8954}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/Neth.vcxproj b/windows/Neth.vcxproj new file mode 100644 index 000000000..19991e549 --- /dev/null +++ b/windows/Neth.vcxproj @@ -0,0 +1,213 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Win32Proj + Nethereum + neth + {90C70663-7181-4E99-9079-54188CEB8954} + + + + Application + true + v120 + + + Application + true + v120 + + + Application + false + v120 + + + Application + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + false + + + false + + + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + ncurses/include/ncurses;%(AdditionalIncludeDirectories) + + + Console + true + true + $(BoostDir)/stage/$(Platform);ncurses/lib/$(Platform) + wncurses.lib;wform.lib;wmenu.lib;wpanel.lib;%(AdditionalDependencies) + + + + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + ncurses/include/ncurses;ncurses/include/ncurses;%(AdditionalIncludeDirectories) + + + Console + true + $(BoostDir)/stage/$(Platform);ncurses/lib/$(Platform) + wncurses.lib;wform.lib;wmenu.lib;wpanel.lib;%(AdditionalDependencies) + + + + + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + AnySuitable + ncurses/include/ncurses;%(AdditionalIncludeDirectories) + + + Console + true + true + true + true + $(BoostDir)/stage/$(Platform);ncurses/lib/$(Platform) + wncurses.lib;wform.lib;wmenu.lib;wpanel.lib;%(AdditionalDependencies) + + + + + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + AnySuitable + ncurses/include/ncurses;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(BoostDir)/stage/$(Platform);ncurses/lib/$(Platform) + wncurses.lib;wform.lib;wmenu.lib;wpanel.lib;%(AdditionalDependencies) + + + + + {826e68cb-d3ee-4a8a-b540-59a8c3f38d4f} + + + + + Document + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(IntDir)%(FileName).h + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(IntDir)%(FileName).h + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(IntDir)%(FileName).h + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(IntDir)%(FileName).h + ../.git/index + ../.git/index + ../.git/index + ../.git/index + + + + + + + + + + $(BuildDependsOn);FinalCopy + + + + + + + + + + + + + + \ No newline at end of file