From f9b59088a151f84d73f7071c8b0484c0bf171094 Mon Sep 17 00:00:00 2001
From: Fatbag <X-Fi6@phppoll.org>
Date: Mon, 30 Jan 2012 00:08:04 -0600
Subject: [PATCH] Added freetype under cmake. My immediate next job is
 libvitaboy.

---
 CMakeLists.txt                        | 2 +-
 Compiling instructions.txt            | 2 +-
 Libraries/FileHandler/CMakeLists.txt  | 2 ++
 Tools/FARDive/CMakeLists.txt          | 5 +++--
 Tools/FARDive/windows/ReadPNGIcon.cpp | 2 +-
 Tools/FARDive/windows/Startup.cpp     | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bafb16c..9065322 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ endif()
 
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
     # Base options
-    set(CFLAGS  "-Wall -Wextra -Wabi -m32 -mmmx -msse -msse2 -msse3 -mfpmath=both -msahf")
+    set(CFLAGS  "-Wall -Wextra -Wabi -pedantic -m32 -mmmx -msse -msse2 -msse3 -mfpmath=both -msahf")
     set(LDFLAGS "-m32")
     set(RCFLAGS "-F pe-i386")
     set(ASMFLAGS "-O3 -F win32")
diff --git a/Compiling instructions.txt b/Compiling instructions.txt
index 38dd57d..1f27bc3 100644
--- a/Compiling instructions.txt	
+++ b/Compiling instructions.txt	
@@ -1,4 +1,4 @@
-All you need installed to compile Niotso for Windows, Linux, or Mac is cmake 2.6 or newer, a compatible compiler (such as GCC 4.6 or newer), and NASM 2.0 or newer for libjpeg-turbo.
+All you need installed to compile Niotso for Windows, Linux, or Mac is cmake 2.6 or newer, a compatible compiler (such as GCC 4.6 or newer), and NASM 2.0 or newer for libjpeg-turbo and libmpg123.
 
 cd into the _build directory and run
  $ cmake -G "<Generator name>" ..
diff --git a/Libraries/FileHandler/CMakeLists.txt b/Libraries/FileHandler/CMakeLists.txt
index c925f6d..6abf786 100644
--- a/Libraries/FileHandler/CMakeLists.txt
+++ b/Libraries/FileHandler/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(libexpat)
+add_subdirectory(libfar)
 add_subdirectory(libpng)
 add_subdirectory(utk)
 add_subdirectory(xa)
diff --git a/Tools/FARDive/CMakeLists.txt b/Tools/FARDive/CMakeLists.txt
index 32f9979..394948b 100644
--- a/Tools/FARDive/CMakeLists.txt
+++ b/Tools/FARDive/CMakeLists.txt
@@ -12,8 +12,9 @@ if(WIN32)
         windows/Dialog/AddToArchive.cpp
         windows/Dialog/NewArchive.cpp
     )
-    set(FARDIVE_LINK -mwindows ole32 uxtheme)
+    set(FARDIVE_LINK ole32 uxtheme)
+    add_executable(FARDive WIN32 ${FARDIVE_SOURCES})
 endif()
 
-add_executable(FARDive ${FARDIVE_SOURCES})
+include_directories(${CMAKE_SOURCE_DIR}/Libraries/FileHandler/libpng)
 target_link_libraries(FARDive ${FARDIVE_LINK} libpng_shared)
\ No newline at end of file
diff --git a/Tools/FARDive/windows/ReadPNGIcon.cpp b/Tools/FARDive/windows/ReadPNGIcon.cpp
index 474463e..faa6704 100644
--- a/Tools/FARDive/windows/ReadPNGIcon.cpp
+++ b/Tools/FARDive/windows/ReadPNGIcon.cpp
@@ -1,5 +1,5 @@
 #include <windows.h>
-#include "../../../Libraries/FileHandler/libpng/png.h"
+#include <png.h>
 
 extern HDC hDC;
 
diff --git a/Tools/FARDive/windows/Startup.cpp b/Tools/FARDive/windows/Startup.cpp
index 5c2e736..14dafcc 100644
--- a/Tools/FARDive/windows/Startup.cpp
+++ b/Tools/FARDive/windows/Startup.cpp
@@ -1,6 +1,6 @@
 #include "Windows.hpp"
 #include "GUI.hpp"
-#include "../../../Libraries/FileHandler/libpng/png.h"
+#include <png.h>
 
 HBITMAP PNGIcon[MENUICONS];