From 9edddbdd885c4a489894e740f0ef40e643b77d81 Mon Sep 17 00:00:00 2001 From: coolbreeze413 Date: Sat, 3 Feb 2024 00:53:22 +0530 Subject: [PATCH] Add OpenFPGA fixes for header inclusion, Add VCPKG to CMake search path, add gitignore --- .github/workflows/build-windows.yml | 8 ++++++-- .gitignore | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 3253f61..8ba5e92 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -119,6 +119,8 @@ jobs: find ${SOURCE_DIR}/vtr-verilog-to-routing/libs/EXTERNAL/capnproto/c++/src/kj/test-helpers.c++ -type f -exec sed -i 's-needle.size()};-needle.end()};-g' {} \; find ${SOURCE_DIR}/vtr-verilog-to-routing/libs/EXTERNAL/capnproto/c++/ekam-provider/canonical/kj/test-helpers.c++ -type f -exec sed -i 's-needle.size()};-needle.end()};-g' {} \; find ${SOURCE_DIR}/vtr-verilog-to-routing/libs/EXTERNAL/capnproto/c++/ekam-provider/c++header/kj/test-helpers.c++ -type f -exec sed -i 's-needle.size()};-needle.end()};-g' {} \; + find ${SOURCE_DIR}/openfpga/libs/libnamemanager/src/base/io_name_map.h -type f -exec sed -i '7 i #include ' {} \; + find ${SOURCE_DIR}/openfpga/src/fpga_bitstream/fabric_bitstream.h -type f -exec sed -i '33 i #include ' {} \; export SOURCE_DIR_PATH_W=$(cygpath -w "${SOURCE_DIR}" | sed 's;\\;/;g') echo "${SOURCE_DIR_PATH_W}" export MSYS2_ARG_CONV_EXCL="../EXTERNAL/capnproto/c++/src/capnp/capnp.exe;${SOURCE_DIR_PATH_W}/build/vtr-verilog-to-routing/libs/EXTERNAL/capnproto/c++/src/capnp/capnpc-c++.exe:." @@ -220,7 +222,7 @@ jobs: - name: Install libusb with vcpkg run: | - C:\vcpkg\vcpkg.exe install libusb tbb zlib --triplet=x64-windows + C:\vcpkg\vcpkg.exe install libusb tbb zlib gtk3 libx11 --triplet=x64-windows C:\vcpkg\vcpkg.exe integrate install - name: Install nasm with choco @@ -261,6 +263,8 @@ jobs: find ${SOURCE_DIR}/vtr-verilog-to-routing/libs/EXTERNAL/capnproto/c++/src/kj/test-helpers.c++ -type f -exec sed -i 's-needle.size()};-needle.end()};-g' {} \; find ${SOURCE_DIR}/vtr-verilog-to-routing/libs/EXTERNAL/capnproto/c++/ekam-provider/canonical/kj/test-helpers.c++ -type f -exec sed -i 's-needle.size()};-needle.end()};-g' {} \; find ${SOURCE_DIR}/vtr-verilog-to-routing/libs/EXTERNAL/capnproto/c++/ekam-provider/c++header/kj/test-helpers.c++ -type f -exec sed -i 's-needle.size()};-needle.end()};-g' {} \; + find ${SOURCE_DIR}/openfpga/libs/libnamemanager/src/base/io_name_map.h -type f -exec sed -i '7 i #include ' {} \; + find ${SOURCE_DIR}/openfpga/src/fpga_bitstream/fabric_bitstream.h -type f -exec sed -i '33 i #include ' {} \; shell: bash - name: Build & Test @@ -287,7 +291,7 @@ jobs: # printf "\n\n >>> cmake configure <<<\n" - cmake -G "Ninja" -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR_W% -DOPENFPGA_WITH_YOSYS=OFF -DOPENFPGA_WITH_YOSYS_PLUGIN=OFF -DOPENFPGA_WITH_TEST=OFF -DOPENFPGA_WITH_VERSION=OFF -DOPENFPGA_WITH_SWIG=OFF -DWITH_ABC=OFF -DHAVE_STRUCT_TIMESPEC=1 -DABC_USE_STDINT_H=1 -S %SOURCE_DIR_W% -B %BUILD_DIR_W% + cmake -G "Ninja" -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR_W% -DOPENFPGA_WITH_YOSYS=OFF -DOPENFPGA_WITH_YOSYS_PLUGIN=OFF -DOPENFPGA_WITH_TEST=OFF -DOPENFPGA_WITH_VERSION=OFF -DOPENFPGA_WITH_SWIG=OFF -DWITH_ABC=OFF -DHAVE_STRUCT_TIMESPEC=1 -DABC_USE_STDINT_H=1 -DCMAKE_TOOLCHAIN_FILE="%VCPKG_INSTALLATION_ROOT%\\scripts\\buildsystems\\vcpkg.cmake" -S %SOURCE_DIR_W% -B %BUILD_DIR_W% # printf "\n\n >>> build and install <<<\n" cmake --build %BUILD_DIR_W% -j%CPU_CORES% diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dbe9c82 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vscode/ \ No newline at end of file