Skip to content
This repository was archived by the owner on Jul 1, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ find_package(BISON 3.0.4 REQUIRED)
if (APPLE)
set(cxxlib libc++)
set(force_compiler "compiler=apple-clang")
include_directories(/usr/local/include)
link_directories(/usr/local/lib)
else ()
set(cxxlib libstdc++11)
set(force_compiler "")
Expand Down Expand Up @@ -48,3 +50,4 @@ add_subdirectory(share)
add_subdirectory(src)
add_subdirectory(test)
add_subdirectory(tools)

24 changes: 12 additions & 12 deletions setup
Original file line number Diff line number Diff line change
Expand Up @@ -277,18 +277,18 @@ case "${unameOut}" in
esac
fi
export CPP="g++ -E"
if [ ! -d "/usr/include" ]; then
if [ $SILENT -eq 1 ]; then
echo "Your /usr/include directly does not seem to be configured correctly (CI ignored)."
else
echo "Your /usr/include directly does not seem to be configured correctly."
OS_VERSION=$(sw_vers -productVersion | sed "s:.[[:digit:]]*.$::g")
HEADERS_INSTALL_PATH="/Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_${OS_VERSION}.pkg"
echo "Try installing the package manually by running:"
echo "${WHITE}open ${HEADERS_INSTALL_PATH}${NC}"
exit 1
fi
fi
#if [ ! -d "/usr/include" ]; then
# if [ $SILENT -eq 1 ]; then
# echo "Your /usr/include directly does not seem to be configured correctly (CI ignored)."
# else
# echo "Your /usr/include directly does not seem to be configured correctly."
# OS_VERSION=$(sw_vers -productVersion | sed "s:.[[:digit:]]*.$::g")
# HEADERS_INSTALL_PATH="/Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_${OS_VERSION}.pkg"
# echo "Try installing the package manually by running:"
# echo "${WHITE}open ${HEADERS_INSTALL_PATH}${NC}"
# exit 1
# fi
#fi
build_cascade "-DFLEX_EXECUTABLE=/usr/local/opt/flex/bin/flex -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison -DFLEX_INCLUDE_DIR=/usr/local/opt/flex/include"
;;

Expand Down
12 changes: 12 additions & 0 deletions share/cascade/de10/ip/program_logic.v
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module program_logic(
input wire clk,
input wire reset,
input wire[15:0] s0_address,
input wire s0_read,
input wire s0_write,
output wire[15:0] s0_readdata,
input wire [15:0] s0_writedata,
output wire s0_waitrequest
);
// Does nothing
endmodule
323 changes: 0 additions & 323 deletions share/cascade/de10/software/spl_bsp/Makefile

This file was deleted.

Loading