Browse Source

Fix non-serpent cmake issue.

cl-refactor
Gav Wood 11 years ago
parent
commit
1eede08609
  1. 2
      CMakeLists.txt
  2. 4
      alethzero/MainWin.cpp

2
CMakeLists.txt

@ -168,11 +168,11 @@ else ()
if ( SERPENT_ID AND SERPENT_LS )
message(STATUS "Found serpent (headers in ${SERPENT_ID}, library ${SERPENT_LS})")
add_definitions(-DETH_SERPENT)
include_directories(${SERPENT_ID})
set( SERPENT_LIBRARIES ${SERPENT_LS} )
else ()
message(STATUS "Serpent not found. No serpent support.")
endif ()
include_directories(${SERPENT_ID})
find_path( LEVELDB_ID leveldb/db.h
/usr/include

4
alethzero/MainWin.cpp

@ -970,7 +970,7 @@ void Main::on_data_textChanged()
}
else
{
#if ETH_SERPENT
#ifdef ETH_SERPENT
try
{
m_data = eth::asBytes(compile(src));
@ -983,7 +983,7 @@ void Main::on_data_textChanged()
auto asmcodeopt = eth::compileLLLToAsm(ui->data->toPlainText().toStdString(), true);
m_data = compileLLL(ui->data->toPlainText().toStdString(), true, &errors);
lll = "<h4>Opt</h4><pre>" + QString::fromStdString(asmcodeopt).toHtmlEscaped() + "</pre><h4>Pre</h4><pre>" + QString::fromStdString(asmcode).toHtmlEscaped() + "</pre>";
#if ETH_SERPENT
#ifdef ETH_SERPENT
}
#endif
}

Loading…
Cancel
Save