mirror of
				https://github.com/ethereum/solidity
				synced 2023-10-03 13:03:40 +00:00 
			
		
		
		
	Merge branch 'develop-evmcc' into pr-jit
This commit is contained in:
		
						commit
						b2cd52eb0d
					
				| @ -7,7 +7,6 @@ include_directories(..) | |||||||
| link_directories(../libethcore) | link_directories(../libethcore) | ||||||
| link_directories(../libethereum) | link_directories(../libethereum) | ||||||
| link_directories(../libevm) | link_directories(../libevm) | ||||||
| link_directories(../libevmjit) |  | ||||||
| 
 | 
 | ||||||
| file(GLOB HEADERS "*.h") | file(GLOB HEADERS "*.h") | ||||||
| add_executable(testeth ${SRC_LIST} ${HEADERS}) | add_executable(testeth ${SRC_LIST} ${HEADERS}) | ||||||
| @ -20,13 +19,17 @@ target_link_libraries(testeth gmp) | |||||||
| target_link_libraries(testeth solidity) | target_link_libraries(testeth solidity) | ||||||
| target_link_libraries(testeth ${CRYPTOPP_LS}) | target_link_libraries(testeth ${CRYPTOPP_LS}) | ||||||
| target_link_libraries(testeth evm) | target_link_libraries(testeth evm) | ||||||
| target_link_libraries(testeth evmjit) | if (EVMJIT) | ||||||
|  | 	target_link_libraries(testeth evmjit) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| target_link_libraries(createRandomTest ethereum) | target_link_libraries(createRandomTest ethereum) | ||||||
| target_link_libraries(createRandomTest ethcore) | target_link_libraries(createRandomTest ethcore) | ||||||
| target_link_libraries(createRandomTest boost_chrono) | target_link_libraries(createRandomTest boost_chrono) | ||||||
| target_link_libraries(createRandomTest boost_unit_test_framework) | target_link_libraries(createRandomTest boost_unit_test_framework) | ||||||
| target_link_libraries(createRandomTest evmjit) | if (EVMJIT) | ||||||
|  | 	target_link_libraries(createRandomTest evmjit) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| if ("${TARGET_PLATFORM}" STREQUAL "w64") | if ("${TARGET_PLATFORM}" STREQUAL "w64") | ||||||
| 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") | 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user