Compare commits

..

No commits in common. "4ca1da90fb1cab41aa3fe6b7d8ca063fc2cb784c" and "46d3a584b4a904479dab9fd667b0e20a61d716e6" have entirely different histories.

2 changed files with 2 additions and 5 deletions

View File

@ -25,7 +25,7 @@ all:set_flags $(objectdir)
debug:set_debug_flags $(objectdir) debug:set_debug_flags $(objectdir)
$(objectdir):$(builddir) $(builddir)/random.o $(builddir)/sa.o src/main.cpp $(objectdir):$(builddir)/random.o $(builddir)/sa.o src/main.cpp
$(CXX) $(CPPFLAGS) $(builddir)/random.o $(builddir)/sa.o src/main.cpp -o $(objectdir) $(CXX) $(CPPFLAGS) $(builddir)/random.o $(builddir)/sa.o src/main.cpp -o $(objectdir)
$(builddir)/random.o:src/random.cpp $(builddir)/random.o:src/random.cpp
@ -34,9 +34,6 @@ $(builddir)/random.o:src/random.cpp
$(builddir)/sa.o:src/sa.cpp $(builddir)/sa.o:src/sa.cpp
$(CXX) $(CPPFLAGS) src/sa.cpp -o $(builddir)/sa.o -c $(CXX) $(CPPFLAGS) src/sa.cpp -o $(builddir)/sa.o -c
$(builddir):
mkdir -p $(builddir)
set_flags: set_flags:
$(eval override CPPFLAGS += $(warnings) $(optimize_flags) $(standart)) $(eval override CPPFLAGS += $(warnings) $(optimize_flags) $(standart))

View File

@ -3,7 +3,7 @@
setlocal enabledelayedexpansion setlocal enabledelayedexpansion
if not defined EXEC ( if not defined EXEC (
set EXEC="build\sabp.exe" set EXEC="build\main.exe"
) )
if not defined TEST_FOLDER ( if not defined TEST_FOLDER (