winapiadmin
diff --git a/‎Makefile‎
Lines changed: 15 additions & 0 deletions b/‎Makefile‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 5 additions & 0 deletions b/‎README.md‎
Lines changed: 5 additions & 0 deletions
@@ -1,8 +1,15 @@
 # Compiler and Flags
 CXX = g++
+<<<<<<< HEAD
 
 # Source files and object files
 SRC = main.cpp eval.cpp search.cpp
+=======
+CXXFLAGS = -march=native -mtune=native -msse4.2 -std=c++17 $(FLAGS) -DNDEBUG
+
+# Source files and object files
+SRC = main.cpp eval.cpp search.cpp pieces.cpp pawns.cpp patterns.cpp
+>>>>>>> 08822de3005f1e1458cbbb02037d1f714fcd46e7
 OBJ = $(SRC:.cpp=.o)
 
 # Output file
@@ -13,11 +20,19 @@ all: $(EXEC)
 
 # Linking the object files into the executable
 $(EXEC): $(OBJ)
+<<<<<<< HEAD
 	$(CXX) $(CXXFLAGS) -std=c++17 -o $(EXEC) $(OBJ)
 
 # Rule to build object files from source files
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -std=c++17 -c $< -o $@
+=======
+	$(CXX) $(CXXFLAGS) -o $(EXEC) $(OBJ)
+
+# Rule to build object files from source files
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+>>>>>>> 08822de3005f1e1458cbbb02037d1f714fcd46e7
 
 # Clean up the compiled files
 clean:
 
@@ -0,0 +1,5 @@
+# cppchess_engine
+
+A minimal chess engine (not UCI, not XBoard, but only search and evaluation functions)
+
+Source: Disservin/chess-library/include