From 38a07b197cff153142efe113a91d2e8f94b26c8a Mon Sep 17 00:00:00 2001
From: ximion <ximion@6778bc44-b910-0410-a7a0-be141de4315d>
Date: Thu, 5 Jan 2012 21:31:03 +0000
Subject: [PATCH] Fix compilation on Windows

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1382 6778bc44-b910-0410-a7a0-be141de4315d
---
 src/libprojectM/CMakeLists.txt                              | 2 +-
 src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp     | 3 ++-
 src/libprojectM/NativePresetFactory/CMakeLists.txt          | 3 ++-
 src/libprojectM/NativePresetFactory/NativePresetFactory.cpp | 5 ++++-
 src/libprojectM/Renderer/CMakeLists.txt                     | 1 +
 src/libprojectM/Renderer/MilkdropWaveform.cpp               | 4 +++-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt
index 62f6a008c..c64f735c2 100644
--- a/src/libprojectM/CMakeLists.txt
+++ b/src/libprojectM/CMakeLists.txt
@@ -179,7 +179,7 @@ IF(USE_OPENMP AND SUPPORTS_OPENMP)
 ENDIF(USE_OPENMP AND SUPPORTS_OPENMP)
 
 INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${FTGL_INCLUDE_DIRS} ${Renderer_SOURCE_DIR} ${PRESET_FACTORY_SOURCES})
-LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR})
+LINK_DIRECTORIES(${FTGL_LIBRARY_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR})
 
 if(MSVC)
 	SET (MATH_LIBRARIES )
diff --git a/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp
index df294fc9d..5a4c88220 100644
--- a/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp
+++ b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp
@@ -3,6 +3,7 @@
 #include <math.h>
 #include <cassert>
 #include <iostream>
+#include <cmath>
 #include "Renderer/BeatDetect.hpp"
 
 PresetInputs::PresetInputs() : PipelineContext()
@@ -195,7 +196,7 @@ void PresetOutputs::PerPixelMath(const PipelineContext &context)
 	{
 		for (y = 0; y < gy; y++)
 		{
-			fZoom2 = powf(this->zoom_mesh[x][y], powf(this->zoomexp_mesh[x][y],
+			fZoom2 = std::pow(this->zoom_mesh[x][y], std::pow(this->zoomexp_mesh[x][y],
 					rad_mesh[x][y] * 2.0f - 1.0f));
 			fZoom2Inv = 1.0f / fZoom2;
 			this->x_mesh[x][y] = this->orig_x[x][y] * 0.5f * fZoom2Inv + 0.5f;
diff --git a/src/libprojectM/NativePresetFactory/CMakeLists.txt b/src/libprojectM/NativePresetFactory/CMakeLists.txt
index 36903e149..9d628e5a8 100644
--- a/src/libprojectM/NativePresetFactory/CMakeLists.txt
+++ b/src/libprojectM/NativePresetFactory/CMakeLists.txt
@@ -10,6 +10,7 @@ SET(NativePresetFactory_SOURCES NativePresetFactory.cpp)
 IF(NOT MSVC)
 	SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 ENDIF(NOT MSVC)
+find_library(DL_LIBRARIES dl)
 
 if(MSVC)
 	SET (MATH_LIBRARIES )
@@ -20,4 +21,4 @@ endif(MSVC)
 INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${Renderer_SOURCE_DIR})
 ADD_LIBRARY(NativePresetFactory STATIC ${NativePresetFactory_SOURCES})
 SET_TARGET_PROPERTIES(NativePresetFactory PROPERTIES VERSION 2.00 SOVERSION 2)
-TARGET_LINK_LIBRARIES(NativePresetFactory Renderer ${MATH_LIBRARIES} dl)
+TARGET_LINK_LIBRARIES(NativePresetFactory Renderer ${MATH_LIBRARIES} ${DL_LIBRARIES})
diff --git a/src/libprojectM/NativePresetFactory/NativePresetFactory.cpp b/src/libprojectM/NativePresetFactory/NativePresetFactory.cpp
index 5306a8390..529d82528 100644
--- a/src/libprojectM/NativePresetFactory/NativePresetFactory.cpp
+++ b/src/libprojectM/NativePresetFactory/NativePresetFactory.cpp
@@ -10,7 +10,10 @@
 //
 //
 
-#include <dlfcn.h>
+extern "C" {
+#  include <dlfcn.h>
+}
+
 #include "NativePresetFactory.hpp"
 
 typedef void Handle;
diff --git a/src/libprojectM/Renderer/CMakeLists.txt b/src/libprojectM/Renderer/CMakeLists.txt
index 369ee0c49..c37ceb143 100644
--- a/src/libprojectM/Renderer/CMakeLists.txt
+++ b/src/libprojectM/Renderer/CMakeLists.txt
@@ -30,3 +30,4 @@ TARGET_LINK_LIBRARIES(Renderer ${MATH_LIBRARIES}
 			${CG_LINK_TARGETS}
 			${FREETYPE2_LIBRARIES}
 )
+set_target_properties(Renderer PROPERTIES COMPILE_FLAGS "-Wno-parentheses")
diff --git a/src/libprojectM/Renderer/MilkdropWaveform.cpp b/src/libprojectM/Renderer/MilkdropWaveform.cpp
index 455eedb1a..d93291e01 100644
--- a/src/libprojectM/Renderer/MilkdropWaveform.cpp
+++ b/src/libprojectM/Renderer/MilkdropWaveform.cpp
@@ -16,6 +16,8 @@
 #include <OpenGL/gl.h>
 #endif
 
+#include <cmath>
+
 #include "MilkdropWaveform.hpp"
 #include "math.h"
 #include "BeatDetect.hpp"
@@ -124,7 +126,7 @@ void MilkdropWaveform::MaximizeColors(RenderContext &context)
 			case 2048: temp_a *= 0.33f; break;
 		}
 		temp_a*=1.3f;
-		temp_a*=powf(context.beatDetect->treb , 2.0f);
+		temp_a*=std::pow(context.beatDetect->treb , 2.0f);
 	}
 
 	if (maximizeColors==true)