diff --git a/CMakeLists.txt b/CMakeLists.txt index ec5ae1db9..4574ed621 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ else () endif () # Initialize CXXFLAGS. -set(CMAKE_CXX_FLAGS "-Wall -std=c++11") +set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra") set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-O4 -DNDEBUG") diff --git a/libethereum/CommonData.cpp b/libethereum/CommonData.cpp index 261d110c1..2e3259a4b 100644 --- a/libethereum/CommonData.cpp +++ b/libethereum/CommonData.cpp @@ -36,7 +36,7 @@ std::string eth::escaped(std::string const& _s, bool _all) ret += "\\\""; else if (i == '\\' && !_all) ret += "\\\\"; - else if (i < ' ' || i > 127 || _all) + else if (i < ' ' || _all) { ret += "\\x"; ret.push_back("0123456789abcdef"[(uint8_t)i / 16]); diff --git a/libethereum/CommonEth.cpp b/libethereum/CommonEth.cpp index 93d484a6a..9aaac13a5 100644 --- a/libethereum/CommonEth.cpp +++ b/libethereum/CommonEth.cpp @@ -20,19 +20,7 @@ */ #include "CommonEth.h" - -#if WIN32 -#pragma warning(push) -#pragma warning(disable:4244) -#else -#pragma GCC diagnostic ignored "-Wunused-function" -#endif -#include -#include -#if WIN32 -#pragma warning(pop) -#else -#endif +#include "CryptoHeaders.h" #include "Exceptions.h" using namespace std; using namespace eth; diff --git a/libethereum/CryptoHeaders.h b/libethereum/CryptoHeaders.h new file mode 100644 index 000000000..9e8add0b6 --- /dev/null +++ b/libethereum/CryptoHeaders.h @@ -0,0 +1,36 @@ +/* + This file is part of cpp-ethereum. + + cpp-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + cpp-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with cpp-ethereum. If not, see . +*/ +/** @file CryptoHeaders.h + * @author Tim Hughes + * @date 2014 + */ +#pragma once + +// need to leave this one disabled +#pragma GCC diagnostic ignored "-Wunused-function" + +#pragma warning(push) +#pragma warning(disable:4100 4244) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wconversion" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#include +#include +#include +#include +#pragma warning(pop) +#pragma GCC diagnostic pop diff --git a/libethereum/Dagger.cpp b/libethereum/Dagger.cpp index ee5599da9..31ddbd1bd 100644 --- a/libethereum/Dagger.cpp +++ b/libethereum/Dagger.cpp @@ -22,17 +22,8 @@ #include #include #include -#if WIN32 -#pragma warning(push) -#pragma warning(disable:4244) -#else -#pragma GCC diagnostic ignored "-Wunused-function" -#endif -#include -#if WIN32 -#pragma warning(pop) -#endif #include +#include "CryptoHeaders.h" #include "Common.h" #include "Dagger.h" using namespace std; diff --git a/libethereum/ExtVMFace.h b/libethereum/ExtVMFace.h index ccb49c48b..5ee43f124 100644 --- a/libethereum/ExtVMFace.h +++ b/libethereum/ExtVMFace.h @@ -53,15 +53,23 @@ public: currentNumber(_currentNumber) {} - u256 store(u256 _n) { return 0; } - void setStore(u256 _n, u256 _v) {} - void mktx(Transaction& _t) {} - u256 balance(Address _a) { return 0; } - void payFee(bigint _fee) {} - u256 txCount(Address _a) { return 0; } - u256 extro(Address _a, u256 _pos) { return 0; } - u256 extroPrice(Address _a) { return 0; } - void suicide(Address _a) {} + +#pragma warning(push) +#pragma warning(disable: 4100) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" + + u256 store(u256 _n) { return 0; } + void setStore(u256 _n, u256 _v) {} + void mktx(Transaction& _t) {} + u256 balance(Address _a) { return 0; } + void payFee(bigint _fee) {} + u256 txCount(Address _a) { return 0; } + u256 extro(Address _a, u256 _pos) { return 0; } + u256 extroPrice(Address _a) { return 0; } + void suicide(Address _a) {} +#pragma GCC diagnostic pop +#pragma warning(pop) Address myAddress; Address txSender; diff --git a/libethereum/PeerServer.cpp b/libethereum/PeerServer.cpp index f4f630f86..112e77b61 100644 --- a/libethereum/PeerServer.cpp +++ b/libethereum/PeerServer.cpp @@ -55,7 +55,7 @@ static const set c_rejectAddresses = { {bi::address_v6::from_string("::")} }; -PeerServer::PeerServer(std::string const& _clientVersion, BlockChain const& _ch, uint _networkId, unsigned short _port, NodeMode _m, string const& _publicAddress, bool _upnp): +PeerServer::PeerServer(std::string const& _clientVersion, BlockChain const& _ch, unsigned int _networkId, unsigned short _port, NodeMode _m, string const& _publicAddress, bool _upnp): m_clientVersion(_clientVersion), m_mode(_m), m_listenPort(_port), @@ -71,7 +71,7 @@ PeerServer::PeerServer(std::string const& _clientVersion, BlockChain const& _ch, clog(NetNote) << "Id:" << toHex(m_key.address().ref().cropped(0, 4)) << "Mode: " << (_m == NodeMode::PeerServer ? "PeerServer" : "Full"); } -PeerServer::PeerServer(std::string const& _clientVersion, uint _networkId, NodeMode _m): +PeerServer::PeerServer(std::string const& _clientVersion, unsigned int _networkId, NodeMode _m): m_clientVersion(_clientVersion), m_mode(_m), m_listenPort(0), diff --git a/libethereum/PeerServer.h b/libethereum/PeerServer.h index 98214feb7..033fe9bbc 100644 --- a/libethereum/PeerServer.h +++ b/libethereum/PeerServer.h @@ -41,9 +41,9 @@ class PeerServer public: /// Start server, listening for connections on the given port. - PeerServer(std::string const& _clientVersion, BlockChain const& _ch, uint _networkId, unsigned short _port, NodeMode _m = NodeMode::Full, std::string const& _publicAddress = std::string(), bool _upnp = true); + PeerServer(std::string const& _clientVersion, BlockChain const& _ch, unsigned int _networkId, unsigned short _port, NodeMode _m = NodeMode::Full, std::string const& _publicAddress = std::string(), bool _upnp = true); /// Start server, but don't listen. - PeerServer(std::string const& _clientVersion, uint _networkId, NodeMode _m = NodeMode::Full); + PeerServer(std::string const& _clientVersion, unsigned int _networkId, NodeMode _m = NodeMode::Full); ~PeerServer(); static unsigned protocolVersion(); diff --git a/libethereum/PeerSession.cpp b/libethereum/PeerSession.cpp index eaedefdf0..e8719f1f2 100644 --- a/libethereum/PeerSession.cpp +++ b/libethereum/PeerSession.cpp @@ -431,7 +431,7 @@ void PeerSession::sendDestroy(bytes& _msg) auto self(shared_from_this()); bytes* buffer = new bytes(std::move(_msg)); if (m_socket.is_open()) - ba::async_write(m_socket, ba::buffer(*buffer), [self, buffer](boost::system::error_code ec, std::size_t length) + ba::async_write(m_socket, ba::buffer(*buffer), [self, buffer](boost::system::error_code ec, std::size_t /*length*/) { delete buffer; if (ec) @@ -455,7 +455,7 @@ void PeerSession::send(bytesConstRef _msg) auto self(shared_from_this()); bytes* buffer = new bytes(_msg.toBytes()); if (m_socket.is_open()) - ba::async_write(m_socket, ba::buffer(*buffer), [self, buffer](boost::system::error_code ec, std::size_t length) + ba::async_write(m_socket, ba::buffer(*buffer), [self, buffer](boost::system::error_code ec, std::size_t /*length*/) { delete buffer; if (ec) diff --git a/libethereum/State.h b/libethereum/State.h index be53c2b9c..7aaad3c05 100644 --- a/libethereum/State.h +++ b/libethereum/State.h @@ -76,7 +76,7 @@ public: Address address() const { return m_ourAddress; } /// Open a DB - useful for passing into the constructor & keeping for other states that are necessary. - static Overlay openDB(std::string _path, bool _killExisting = false); + static Overlay openDB(std::string _path, bool _killExisting = false); static Overlay openDB(bool _killExisting = false) { return openDB(std::string(), _killExisting); } /// @returns the set containing all addresses currently in use in Ethereum. @@ -292,7 +292,7 @@ public: u256 balance(Address _a) { return m_s.balance(_a); } u256 txCount(Address _a) { return m_s.transactionsFrom(_a); } u256 extro(Address _a, u256 _pos) { return m_s.contractMemory(_a, _pos); } - u256 extroPrice(Address _a) { return 0; } + u256 extroPrice(Address /*_a*/) { return 0; } void suicide(Address _a) { m_s.addBalance(_a, m_s.balance(myAddress) + m_store->size() * fees.m_memoryFee); diff --git a/libethereum/TrieDB.h b/libethereum/TrieDB.h index fbd0b238c..97be0c278 100644 --- a/libethereum/TrieDB.h +++ b/libethereum/TrieDB.h @@ -23,7 +23,6 @@ #include #include -#include #include "Exceptions.h" #include "CommonEth.h" #include "Log.h" @@ -84,11 +83,6 @@ private: ldb::WriteOptions m_writeOptions; }; -#if WIN32 -#pragma warning(push) -#pragma warning(disable:4100) // disable warnings so it compiles -#endif - extern const h256 c_shaNull; /** @@ -339,10 +333,6 @@ std::ostream& operator<<(std::ostream& _out, GenericTrieDB const& _db) return _out; } -#if WIN32 -#pragma warning(pop) -#endif - template class TrieDB: public GenericTrieDB { diff --git a/libethereum/VM.cpp b/libethereum/VM.cpp index 727559751..392d360ae 100644 --- a/libethereum/VM.cpp +++ b/libethereum/VM.cpp @@ -21,28 +21,6 @@ #include "VM.h" -#include -#include -#if WIN32 -#pragma warning(push) -#pragma warning(disable:4244) -#else -#pragma GCC diagnostic ignored "-Wunused-function" -#endif -#include -#include -#include -#if WIN32 -#pragma warning(pop) -#else -#endif -#include -#include -#include "BlockChain.h" -#include "Instruction.h" -#include "Exceptions.h" -#include "Dagger.h" -#include "Defaults.h" using namespace std; using namespace eth; diff --git a/libethereum/VM.h b/libethereum/VM.h index 2f7d1fcaf..8b0f120dd 100644 --- a/libethereum/VM.h +++ b/libethereum/VM.h @@ -22,20 +22,7 @@ #pragma once #include -#include -#if WIN32 -#pragma warning(push) -#pragma warning(disable:4244) -#else -#pragma GCC diagnostic ignored "-Wunused-function" -#endif -#include -#include -#include -#if WIN32 -#pragma warning(pop) -#else -#endif +#include "CryptoHeaders.h" #include "Common.h" #include "Exceptions.h" #include "FeeStructure.h" diff --git a/libethereum/vector_ref.h b/libethereum/vector_ref.h index f9b100ed8..94d1ed5a9 100644 --- a/libethereum/vector_ref.h +++ b/libethereum/vector_ref.h @@ -5,14 +5,10 @@ #include #include -#if WIN32 #pragma warning(push) -#pragma warning(disable: 4267) -#endif +#pragma warning(disable: 4100 4267) #include -#if WIN32 #pragma warning(pop) -#endif namespace eth { diff --git a/test/JsonSpiritHeaders.h b/test/JsonSpiritHeaders.h new file mode 100644 index 000000000..2b81c8d9c --- /dev/null +++ b/test/JsonSpiritHeaders.h @@ -0,0 +1,32 @@ +/* + This file is part of cpp-ethereum. + + cpp-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + cpp-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with cpp-ethereum. If not, see . +*/ +/** @file JsonSpiritHeaders.h + * @author Tim Hughes + * @date 2014 + */ +#pragma once + +#pragma warning(push) +#pragma warning(disable: 4100) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wconversion" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#include "../json_spirit/json_spirit_reader_template.h" +#include "../json_spirit/json_spirit_writer_template.h" +#pragma GCC diagnostic pop +#pragma warning(pop) + diff --git a/test/hexPrefix.cpp b/test/hexPrefix.cpp index 62f4d4916..0db8e75e9 100644 --- a/test/hexPrefix.cpp +++ b/test/hexPrefix.cpp @@ -21,8 +21,7 @@ */ #include -#include "../json_spirit/json_spirit_reader_template.h" -#include "../json_spirit/json_spirit_writer_template.h" +#include "JsonSpiritHeaders.h" #include "TrieCommon.h" #include "Log.h" using namespace std; diff --git a/test/rlp.cpp b/test/rlp.cpp index f82af521f..f6c244423 100644 --- a/test/rlp.cpp +++ b/test/rlp.cpp @@ -21,8 +21,7 @@ */ #include -#include "../json_spirit/json_spirit_reader_template.h" -#include "../json_spirit/json_spirit_writer_template.h" +#include "JsonSpiritHeaders.h" #include #include using namespace std; diff --git a/test/trie.cpp b/test/trie.cpp index 9d2bb3763..5e3cfcb6c 100644 --- a/test/trie.cpp +++ b/test/trie.cpp @@ -21,9 +21,8 @@ */ #include -#include "../json_spirit/json_spirit_reader_template.h" -#include "../json_spirit/json_spirit_writer_template.h" #include +#include "JsonSpiritHeaders.h" #include #include "TrieHash.h" #include "MemTrie.h" diff --git a/test/vm.cpp b/test/vm.cpp index 03893525c..7e744becb 100644 --- a/test/vm.cpp +++ b/test/vm.cpp @@ -21,13 +21,12 @@ */ #include -#include "../json_spirit/json_spirit_reader_template.h" -#include "../json_spirit/json_spirit_writer_template.h" #include #include #include #include #include +#include "JsonSpiritHeaders.h" using namespace std; using namespace json_spirit; using namespace eth; diff --git a/walleth/MainWin.cpp b/walleth/MainWin.cpp index 95a4b2a4d..44fb183ce 100644 --- a/walleth/MainWin.cpp +++ b/walleth/MainWin.cpp @@ -85,7 +85,7 @@ void QEthereum::setCoinbase(Address _a) } } -QAccount::QAccount(QObject* _p) +QAccount::QAccount(QObject*) { } @@ -170,7 +170,7 @@ double QEthereum::txCountAt(Address _a) const unsigned QEthereum::peerCount() const { - return client()->peerCount(); + return (unsigned)client()->peerCount(); } void QEthereum::transact(Secret _secret, Address _dest, u256 _amount) diff --git a/windows/LibCryptoPP.vcxproj b/windows/LibCryptoPP.vcxproj index 90751d5d0..bfbdcc7e4 100644 --- a/windows/LibCryptoPP.vcxproj +++ b/windows/LibCryptoPP.vcxproj @@ -116,7 +116,7 @@ Disabled MultiThreadedDebug - 4189;4244;%(DisableSpecificWarnings) + 4100;4189;4244;%(DisableSpecificWarnings) Windows @@ -129,7 +129,7 @@ Disabled MultiThreadedDebug - 4189;4244;%(DisableSpecificWarnings) + 4100;4189;4244;%(DisableSpecificWarnings) Windows @@ -144,7 +144,7 @@ true true MultiThreaded - 4189;4244;%(DisableSpecificWarnings) + 4100;4189;4244;%(DisableSpecificWarnings) Windows @@ -161,7 +161,7 @@ true true MultiThreaded - 4189;4244;%(DisableSpecificWarnings) + 4100;4189;4244;%(DisableSpecificWarnings) Windows diff --git a/windows/LibEthereum.props b/windows/LibEthereum.props index 38c353828..75bab0773 100644 --- a/windows/LibEthereum.props +++ b/windows/LibEthereum.props @@ -11,7 +11,7 @@ - 4068;4100;4127;4258;4505;4512;4706 + 4068;4127;4258;4505;4512;4706 Level4 true false diff --git a/windows/LibEthereum.vcxproj b/windows/LibEthereum.vcxproj index af6abbc01..40a30be12 100644 --- a/windows/LibEthereum.vcxproj +++ b/windows/LibEthereum.vcxproj @@ -28,21 +28,36 @@ - + + true + true + true + true + + + + + + true + true + true + true + - + + + - @@ -59,22 +74,28 @@ + + + + + - + + + - diff --git a/windows/LibEthereum.vcxproj.filters b/windows/LibEthereum.vcxproj.filters index 3e4a3ee6d..ebda5b7ad 100644 --- a/windows/LibEthereum.vcxproj.filters +++ b/windows/LibEthereum.vcxproj.filters @@ -1,59 +1,70 @@  + + + Windows + + + + + + - + + + + + - - - - - - Windows - - + + Windows + + + + + + + + - + + + - - - - - Windows - - - + + diff --git a/windows/LibLevelDB.vcxproj b/windows/LibLevelDB.vcxproj index ed04f569a..b97502c01 100644 --- a/windows/LibLevelDB.vcxproj +++ b/windows/LibLevelDB.vcxproj @@ -157,7 +157,7 @@ MultiThreadedDebug %(AdditionalIncludeDirectories);../../leveldb _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4018;4244;4267;4389;4702;4722;4800;4996;%(DisableSpecificWarnings) + 4018;4100;4244;4267;4389;4702;4722;4800;4996;%(DisableSpecificWarnings) Windows @@ -172,7 +172,7 @@ MultiThreadedDebug %(AdditionalIncludeDirectories);../../leveldb _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4018;4244;4267;4389;4702;4722;4800;4996;%(DisableSpecificWarnings) + 4018;4100;4244;4267;4389;4702;4722;4800;4996;%(DisableSpecificWarnings) Windows @@ -189,7 +189,7 @@ MultiThreaded %(AdditionalIncludeDirectories);../../leveldb _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4018;4244;4267;4389;4702;4722;4800;4996;%(DisableSpecificWarnings) + 4018;4100;4244;4267;4389;4702;4722;4800;4996;%(DisableSpecificWarnings) Windows @@ -208,7 +208,7 @@ MultiThreaded %(AdditionalIncludeDirectories);../../leveldb _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4018;4244;4267;4389;4702;4722;4800;4996;%(DisableSpecificWarnings) + 4018;4100;4244;4267;4389;4702;4722;4800;4996;%(DisableSpecificWarnings) Windows diff --git a/windows/LibMiniUPnPc.vcxproj b/windows/LibMiniUPnPc.vcxproj index 7f3e59131..f45b412f4 100644 --- a/windows/LibMiniUPnPc.vcxproj +++ b/windows/LibMiniUPnPc.vcxproj @@ -109,7 +109,7 @@ Disabled MultiThreadedDebug _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4245;4267;4389;%(DisableSpecificWarnings) + 4100;4244;4245;4267;4389;%(DisableSpecificWarnings) Windows @@ -126,7 +126,7 @@ Disabled MultiThreadedDebug _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4245;4267;4389;%(DisableSpecificWarnings) + 4100;4244;4245;4267;4389;%(DisableSpecificWarnings) Windows @@ -145,7 +145,7 @@ true MultiThreaded _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4245;4267;4389;%(DisableSpecificWarnings) + 4100;4244;4245;4267;4389;%(DisableSpecificWarnings) Windows @@ -166,7 +166,7 @@ true MultiThreaded _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4245;4267;4389;%(DisableSpecificWarnings) + 4100;4244;4245;4267;4389;%(DisableSpecificWarnings) Windows diff --git a/windows/TestEthereum.vcxproj b/windows/TestEthereum.vcxproj index 045be7b46..34303ef33 100644 --- a/windows/TestEthereum.vcxproj +++ b/windows/TestEthereum.vcxproj @@ -160,10 +160,12 @@ + + Create @@ -173,6 +175,9 @@ + + + diff --git a/windows/TestEthereum.vcxproj.filters b/windows/TestEthereum.vcxproj.filters index 4f9afb9e9..d5bcd7f41 100644 --- a/windows/TestEthereum.vcxproj.filters +++ b/windows/TestEthereum.vcxproj.filters @@ -1,18 +1,20 @@  + + Windows + + + + + + + - - - - - - Windows - @@ -23,5 +25,8 @@ Windows + + + \ No newline at end of file diff --git a/windows/Walleth.vcxproj b/windows/Walleth.vcxproj index 81076d0ef..4f15a87f7 100644 --- a/windows/Walleth.vcxproj +++ b/windows/Walleth.vcxproj @@ -170,17 +170,17 @@ - "$(Lua)" moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" + $(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" $(IntDir)moc_%(FileName).cpp - "$(Lua)" moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" + $(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" - "$(Lua)" moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" + $(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" - "$(Lua)" moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" + $(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" $(IntDir)moc_%(FileName).cpp @@ -206,6 +206,31 @@ $(IntDir)ui_%(FileName).h + + + Document + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(IntDir)%(FileName).h + $(IntDir)%(FileName).h + $(IntDir)%(FileName).h + $(IntDir)%(FileName).h + ../.git/index + ../.git/index + ../.git/index + ../.git/index + + diff --git a/windows/Walleth.vcxproj.filters b/windows/Walleth.vcxproj.filters index 404370754..5c362b917 100644 --- a/windows/Walleth.vcxproj.filters +++ b/windows/Walleth.vcxproj.filters @@ -14,6 +14,9 @@ + + Windows + diff --git a/windows/WinMain.cpp b/windows/WinMain.cpp index 44680c47f..d2fc147ca 100644 --- a/windows/WinMain.cpp +++ b/windows/WinMain.cpp @@ -5,7 +5,7 @@ extern int main(int argc, char* argv[]); -int WINAPI WinMain(HINSTANCE instance, HINSTANCE prev_instance, char* command_line, int show_command) +int WINAPI WinMain(HINSTANCE /*instance*/, HINSTANCE /*prev_instance*/, char* command_line, int /*show_command*/) { int argc; char** argv; diff --git a/windows/stdafx.h b/windows/stdafx.h index 04ef305af..5a4e4d27d 100644 --- a/windows/stdafx.h +++ b/windows/stdafx.h @@ -21,24 +21,40 @@ #pragma once -#include -#include +#include #include #include -#include -#include -#include -#include #include +#include #include -#include +#include +#include + +#include +#include #include #include +#include +#include #include #include +#include +#include +#include +#include +#include +#include + #include + #include #include -#include #include +#include + +#pragma warning(push) +#pragma warning(disable: 4100 4267) +#include +#pragma warning(pop) +