Merge branch 'main' of github.com:winapiadmin/cppchess_engine

Author: winapiadmin

CMakeLists.txt

@@ -18,10 +18,16 @@ set(SOURCES
     eval.cpp
     search.cpp
     tt.cpp
+<<<<<<< HEAD
     movepick.cpp 
     uci.cpp
     ucioptions.cpp
     timeman.cpp
+=======
+    move_ordering.cpp 
+    uci.cpp
+    ucioptions.cpp
+>>>>>>> 4ed379430df230b7a41541796fa6143eee9ba291
 )
 
 # Define the executable
@@ -60,6 +66,7 @@ endif()
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9")
     target_link_libraries(${PROJECT_NAME} atomic)
 endif()
+<<<<<<< HEAD
 
 # Set default build type if none is specified
 if(NOT CMAKE_BUILD_TYPE)
@@ -74,3 +81,5 @@ else()
     set(CMAKE_CXX_FLAGS_DEBUG "/Zi /Od")
     set(CMAKE_CXX_FLAGS_RELEASE "/O2 /DNDEBUG")
 endif()
+=======
+>>>>>>> 4ed379430df230b7a41541796fa6143eee9ba291

Makefile

@@ -2,7 +2,11 @@
 CXX = g++
 
 # Source files and object files
+<<<<<<< HEAD
 SRC = main.cpp eval.cpp search.cpp tt.cpp movepick.cpp timeman.cpp uci.cpp ucioptions.cpp
+=======
+SRC = main.cpp eval.cpp search.cpp tt.cpp move_ordering.cpp uci.cpp ucioptions.cpp
+>>>>>>> 4ed379430df230b7a41541796fa6143eee9ba291
 OBJ = $(SRC:.cpp=.o)
 
 # Output file
@@ -13,7 +17,7 @@ all: $(EXEC)
 
 # Linking the object files into the executable
 $(EXEC): $(OBJ)
-	$(CXX) $(LDFLAGS) -o $(EXEC) $(OBJ)
+	$(CXX) $(LDFLAGS) -pthread -o $(EXEC) $(OBJ)
 
 # Rule to build object files from source files
 %.o: %.cpp