diff options
| author | Christian <c@ethdev.com> | 2014-10-29 00:01:04 +0800 |
|---|---|---|
| committer | Christian <c@ethdev.com> | 2014-10-29 00:01:04 +0800 |
| commit | bb2b4ed3a3a9ef3cd57deb0f8f4dc5390a546bb5 (patch) | |
| tree | 1b3375ab80bab845a8f3d0c8e8b5f70d2ab5b17a | |
| parent | 3306835c9d880f6a056b5ed22e8d7fd0e751719f (diff) | |
| parent | c3b65c8eab3f7aa5e7e13de0ac49c3d32c439fad (diff) | |
| download | dexon-solidity-bb2b4ed3a3a9ef3cd57deb0f8f4dc5390a546bb5.tar dexon-solidity-bb2b4ed3a3a9ef3cd57deb0f8f4dc5390a546bb5.tar.gz dexon-solidity-bb2b4ed3a3a9ef3cd57deb0f8f4dc5390a546bb5.tar.bz2 dexon-solidity-bb2b4ed3a3a9ef3cd57deb0f8f4dc5390a546bb5.tar.lz dexon-solidity-bb2b4ed3a3a9ef3cd57deb0f8f4dc5390a546bb5.tar.xz dexon-solidity-bb2b4ed3a3a9ef3cd57deb0f8f4dc5390a546bb5.tar.zst dexon-solidity-bb2b4ed3a3a9ef3cd57deb0f8f4dc5390a546bb5.zip | |
Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler
Conflicts:
libsolidity/Types.cpp
| -rw-r--r-- | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | main.cpp | 21 |
2 files changed, 21 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9224c109..386d4a1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,23 +9,6 @@ set(EXECUTABLE solc) add_executable(${EXECUTABLE} ${SRC_LIST}) target_link_libraries(${EXECUTABLE} solidity) -target_link_libraries(${EXECUTABLE} devcore) - -if ("${TARGET_PLATFORM}" STREQUAL "w64") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") - target_link_libraries(${EXECUTABLE} gcc) - target_link_libraries(${EXECUTABLE} gdi32) - target_link_libraries(${EXECUTABLE} ws2_32) - target_link_libraries(${EXECUTABLE} mswsock) - target_link_libraries(${EXECUTABLE} shlwapi) - target_link_libraries(${EXECUTABLE} iphlpapi) - target_link_libraries(${EXECUTABLE} boost_thread_win32-mt-s) - set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS) -elseif (UNIX) -else () - find_package(Threads REQUIRED) - target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT}) -endif () install( TARGETS ${EXECUTABLE} DESTINATION bin ) @@ -1,3 +1,24 @@ +/* + 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 <http://www.gnu.org/licenses/>. +*/ +/** + * @author Christian <c@ethdev.com> + * @date 2014 + * Solidity commandline compiler. + */ #include <string> #include <iostream> |