revert to using upstream CMakeLists.txt for nextpnr (PR with these changes was merged)

edbordin · edbordin · commit 5dc68826c469 · 2020-05-15T08:44:43.000+10:00
diff --git a/scripts/compile-nextpnr-ecp5.sh b/scripts/compile-nextpnr-ecp5.sh
@@ -105,7 +105,6 @@ then
     mingw32-make install
 
     cd $BUILD_DIR/$nextpnr_dir
-    cp $WORK_DIR/scripts/nextpnr-CMakeLists.txt CMakeLists.txt
 
     cmake \
         -G "MinGW Makefiles" \
diff --git a/scripts/compile_nextpnr-ice40.sh b/scripts/compile_nextpnr-ice40.sh
@@ -43,8 +43,6 @@ if [ $ARCH == "darwin" ]; then
     .
     make -j$J CXX="$CXX" LIBS="-lm -fno-lto -ldl -lutil"
 elif [ ${ARCH:0:7} == "windows" ]; then
-    cp $WORK_DIR/scripts/nextpnr-CMakeLists.txt CMakeLists.txt
-
     cmake \
       -G "MinGW Makefiles" \
       -DARCH=ice40 \
diff --git a/scripts/nextpnr-CMakeLists.txt b/scripts/nextpnr-CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,6 @@ if [ $ARCH == "darwin" ]; then`
`43`	`43`	`.`
`44`	`44`	`make -j$J CXX="$CXX" LIBS="-lm -fno-lto -ldl -lutil"`
`45`	`45`	`elif [ ${ARCH:0:7} == "windows" ]; then`
`46`		`- cp $WORK_DIR/scripts/nextpnr-CMakeLists.txt CMakeLists.txt`
`47`		`-`
`48`	`46`	`cmake \`
`49`	`47`	`-G "MinGW Makefiles" \`
`50`	`48`	`-DARCH=ice40 \`