From c9f62cefda53f0638a87847d25e6160bcdd9bb36 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sat, 25 Oct 2014 17:13:40 +0200 Subject: [PATCH 1/3] Remove stupid assertion. Add licence header to solc. --- main.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/main.cpp b/main.cpp index ba0b6ccf7..1acdefd8c 100644 --- a/main.cpp +++ b/main.cpp @@ -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 . +*/ +/** + * @author Christian + * @date 2014 + * Solidity abstract syntax tree. + */ #include #include From fd347fbf4ef7ed3214d38074dfce8a87a5022833 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 25 Oct 2014 17:56:44 +0200 Subject: [PATCH 2/3] CMakeLists library dependency cleanup for libdevcore, libevmface, libsolidity and solc. Fixes #417. --- CMakeLists.txt | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9224c109d..386d4a1a8 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 ) From 2e5e7e676240e49d8e2a3ddc0ef53afd50a7f47c Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 25 Oct 2014 18:30:43 +0200 Subject: [PATCH 3/3] Corrected file description. --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 1acdefd8c..0843cfa02 100644 --- a/main.cpp +++ b/main.cpp @@ -17,7 +17,7 @@ /** * @author Christian * @date 2014 - * Solidity abstract syntax tree. + * Solidity commandline compiler. */ #include