Add MergeGPF to CMake, port to *nix

CMakeLists.txt

@@ -363,5 +363,15 @@ target_include_directories(FTagData PRIVATE
 	)
 target_link_libraries(FTagData PortabilityLayer)
 
+add_executable(MergeGPF MergeGPF/MergeGPF.cpp AerofoilPortable/GpAllocator_C.cpp)
+target_include_directories(MergeGPF PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	UnixCompat
+	)
+target_link_libraries(MergeGPF PortabilityLayer)
+
 
 install (TARGETS ${EXECNAME})

MergeGPF/MergeGPF.cpp

@@ -1,4 +1,8 @@
+#ifdef _WIN32
 #include "WindowsUnicodeToolShim.h"
+#else
+#include "UnixCompat.h"
+#endif
 
 #include "CFileStream.h"
 #include "CombinedTimestamp.h"