Delete build_linux.py, implement vcxproj_make.py in build_linux.bash

rcedgar · Aug 21, 2024 · bac2cb0 · bac2cb0
1 parent e2a6e00
commit bac2cb0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 201 deletions.
diff --git a/src/.gitignore b/src/.gitignore
@@ -1 +1,2 @@
+vcxproj_make.py
 make.std*
diff --git a/src/Makefile b/src/Makefile
@@ -1,5 +1,5 @@
 ######################################################
-# Makefile is generated by ./build_linux.py
+# Makefile is generated by ./vcxproj_make.py
 # Don't edit the Makefile -- update the python script
 ######################################################
 
@@ -8,10 +8,10 @@ OBJDIR := o
 BINPATH := $(BINDIR)/muscle
 
 CXX = g++
-CXXFLAGS := $(CFLAGS) --std=c++11 -ffast-math -march=native -O3 -DNDEBUG -fopenmp
+CXXFLAGS := $(CFLAGS)  -ffast-math -march=native -O3 -DNDEBUG -fopenmp
 
 UNAME_S := $(shell uname -s)
-LDFLAGS := $(LDFLAGS) -ffast-math -march=native -O3 -fopenmp
+LDFLAGS := $(LDFLAGS)  -ffast-math -march=native -O3 -fopenmp
 ifeq ($(UNAME_S),Linux)
     LDFLAGS += -static
 endif

diff --git a/src/build_linux.bash b/src/build_linux.bash
@@ -1 +1,3 @@
-./build_linux.py --openmp
+rm -f vcxproj_make.py
+wget https://github.com/raw/rcedgar/vcxproj_make/b2b5c7a/vcxproj_make.py
+./vcxproj_make.py --openmp
diff --git a/src/build_linux.py b/src/build_linux.py