Merge branch 'fix-duplicate-sym-makefile' into 'master'

remove duplicate augmentation of variables for SYM=sbliss or nauty See merge request integer/scip!3251
scipopt · Nov 27, 2023 · 8e57d70 · 8e57d70
2 parents 35ad246 + 91ebf66
commit 8e57d70
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/make/make.project b/make/make.project
@@ -549,24 +549,6 @@ endif
 CXXFLAGS	+=	$(CXX17FLAG)
 endif
 
-ifeq ($(SYM),nauty)
-ifeq ($(NAUTYEXTERNAL),true)
-LDFLAGS         +=      $(LINKCC_L)$(SCIPREALPATH)/$(LIBDIR)/$(LIBEXTTYPE) $(LINKCC_l)nauty.$(OSTYPE).$(ARCH).$(COMP)$(LINKLIBSUFFIX)
-else
-LIBOBJSUBDIRS   +=      $(LIBOBJDIR)/nauty
-endif
-endif
-
-ifeq ($(SYM),sbliss)
-ifeq ($(BLISSEXTERNAL),true)
-LDFLAGS		+=	$(LINKCC_L)$(SCIPREALPATH)/$(LIBDIR)/$(LIBEXTTYPE) $(LINKCC_l)bliss.$(OSTYPE).$(ARCH).$(COMP)$(LINKLIBSUFFIX)
-else
-LIBOBJSUBDIRS	+=      $(LIBOBJDIR)/bliss/src
-LIBOBJSUBDIRS	+=      $(LIBOBJDIR)/bliss
-endif
-CXXFLAGS	+=	$(CXX17FLAG)
-endif
-
 ifeq ($(SYM),nauty)
 ifeq ($(NAUTYEXTERNAL),true)
 LDFLAGS		+=	$(LINKCC_L)$(SCIPREALPATH)/$(LIBDIR)/$(LIBEXTTYPE) $(LINKCC_l)nauty.$(OSTYPE).$(ARCH).$(COMP)$(LINKLIBSUFFIX)