caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preliminary placer changes to main

Browse Source
This commit is contained in:
ZipCPU 2018-06-07 07:52:05 -04:00
parent 1ed5c641c1
commit 0dbfa4662f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -74,6 +74,7 @@ include_directories(common/ gui/ frontend/json ${Boost_INCLUDE_DIRS} ${PYTHON_IN
aux_source_directory(common/ COMMON_SRC_FILES) aux_source_directory(common/ COMMON_SRC_FILES)
aux_source_directory(frontend/json/ JSON_PARSER_FILES) aux_source_directory(frontend/json/ JSON_PARSER_FILES)
set(COMMON_FILES ${COMMON_SRC_FILES} ${JSON_PARSER_FILES}) set(COMMON_FILES ${COMMON_SRC_FILES} ${JSON_PARSER_FILES})
set(CMAKE_BUILD_TYPE Debug)
foreach (family ${FAMILIES}) foreach (family ${FAMILIES})
string(TOUPPER ${family} ufamily) string(TOUPPER ${family} ufamily)

7
ice40/main.cc
View File

@ -25,6 +25,7 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "pybindings.h" #include "pybindings.h"
#include "version.h" #include "version.h"
#include "log.h"
void svg_dump_el(const GraphicElement &el) void svg_dump_el(const GraphicElement &el)
{ {
@ -52,6 +53,8 @@ int main(int argc, char *argv[])
int rc = 0; int rc = 0;
std::string str; std::string str;
log_files.push_back(stdout);
po::options_description options("Allowed options"); po::options_description options("Allowed options");
options.add_options()("help,h", "show help"); options.add_options()("help,h", "show help");
options.add_options()("test", "just a check"); options.add_options()("test", "just a check");
@ -247,6 +250,10 @@ int main(int argc, char *argv[])
execute_python_file(filename.c_str()); execute_python_file(filename.c_str());
} }
extern void place_design(Design *d);
place_design(&design);
if (vm.count("gui")) { if (vm.count("gui")) {
QApplication a(argc, argv); QApplication a(argc, argv);
MainWindow w; MainWindow w;