fix up tree

CMakeLists.txt

@@ -55,7 +55,7 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} ${PSEH_LIB}")
 set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} ${PSEH_LIB}")
 endif()
 
-else()
+if(MSVC)
 option (BUILD_AVX2 "Enable AVX2 FPU vector instructions." OFF)
 if (BUILD_AVX2)
 add_cflags("/arch:AVX2")
@@ -64,6 +64,7 @@ else()
 add_cflags("/arch:SSE2")
 add_cxxflags("/arch:SSE2")
 endif(BUILD_AVX2)
+endif()
 
 if(STATIC_LINK)
   add_cflags("-static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive")
@@ -479,9 +480,8 @@ add_executable(${TEST_EXE} ${TEST_SRC})
 
 if (WIN32)
 target_link_libraries(${TEST_EXE} ${STATIC_LINK_LIBS} gtest_main ${STATIC_LIB} ws2_32 iphlpapi)
-if (MINGW)
-target_link_libraries(${TEST_EXE} ${STATIC_LINK_LIBS} gtest_main ${STATIC_LIB} ws2_32 stdc++fs iphlpapi)
-endif()
+elseif (MINGW)
+target_link_libraries(${TEST_EXE} ${STATIC_LINK_LIBS} gtest_main ${STATIC_LIB} stdc++fs iphlpapi ws2_32)
 else()
 target_link_libraries(${TEST_EXE} ${STATIC_LINK_LIBS} gtest_main ${STATIC_LIB})
 endif(WIN32)