libprojectM 2.0.0 update for Win32
[vlc.git] / extras / contrib / src / Patches / libprojectM-win32.patch
1 diff -ruN libprojectM/Renderer/TextureManager.cpp libprojectM.new/Renderer/TextureManager.cpp
2 --- libprojectM/Renderer/TextureManager.cpp     2009-12-01 07:38:42.000000000 +0100
3 +++ libprojectM.new/Renderer/TextureManager.cpp 2009-12-03 23:28:44.000000000 +0100
4 @@ -59,7 +59,7 @@
5         ilLoadL(IL_TYPE_UNKNOWN,(ILvoid*) M_data, M_bytes);
6         GLuint tex = ilutGLBindTexImage();
7  #else
8 -        uint tex = SOIL_load_OGL_texture_from_memory(
9 +        unsigned int tex = SOIL_load_OGL_texture_from_memory(
10                                           M_data,
11                                           M_bytes,
12                                           SOIL_LOAD_AUTO,
13 @@ -173,7 +173,7 @@
14  #else
15         int width, height;
16  
17 -       uint tex = SOIL_load_OGL_texture_size(
18 +       unsigned int tex = SOIL_load_OGL_texture_size(
19                    imageURL.c_str(),
20                                           SOIL_LOAD_AUTO,
21                                           SOIL_CREATE_NEW_ID,
22 diff -ruN libprojectM/win32-dirent.h libprojectM.new/win32-dirent.h
23 --- libprojectM/win32-dirent.h  2009-12-01 07:38:42.000000000 +0100
24 +++ libprojectM.new/win32-dirent.h      2009-12-03 23:29:13.000000000 +0100
25 @@ -19,7 +19,7 @@
26  
27  typedef struct DIR DIR;
28  
29 -static int errno;
30 +//static int errno;
31  
32  struct dirent
33  {
34 diff -ruN libprojectM/PresetLoader.hpp libprojectM.new2/PresetLoader.hpp
35 --- libprojectM/PresetLoader.hpp        2009-12-01 07:38:42.000000000 +0100
36 +++ libprojectM.new2/PresetLoader.hpp   2009-12-04 00:29:20.000000000 +0100
37 @@ -6,7 +6,7 @@
38  #include <sys/types.h>
39  
40  #ifdef WIN32
41 -#include "win32-dirent.h"
42 +#include <dirent.h>
43  #endif
44  
45  #ifdef LINUX
46 diff -ruN libprojectM/projectM.cpp libprojectM.new2/projectM.cpp
47 --- libprojectM/projectM.cpp    2009-12-01 07:38:42.000000000 +0100
48 +++ libprojectM.new2/projectM.cpp       2009-12-04 00:28:29.000000000 +0100
49 @@ -24,9 +24,6 @@
50  #include "fatal.h"
51  #include "Common.hpp"
52  
53 -#ifdef WIN32
54 -#include "win32-dirent.h"
55 -#endif
56  
57  #include "timer.h"
58  #include <iostream>
59 diff -ruN libprojectM/projectM.hpp libprojectM.new2/projectM.hpp
60 --- libprojectM/projectM.hpp    2009-12-01 07:38:42.000000000 +0100
61 +++ libprojectM.new2/projectM.hpp       2009-12-04 00:28:22.000000000 +0100
62 @@ -29,11 +29,7 @@
63  #ifndef _PROJECTM_HPP
64  #define _PROJECTM_HPP
65  
66 -#ifdef WIN32
67 -#include "win32-dirent.h"
68 -#else
69  #include <dirent.h>
70 -#endif /** WIN32 */
71  #include <cmath>
72  #include <cstdio>
73  #include <string>
74
75 --- libprojectM/CMakeLists.txt  2009-12-01 07:38:42.000000000 +0100
76 +++ libprojectM.new/CMakeLists.txt      2009-12-04 00:34:12.000000000 +0100
77 @@ -121,15 +121,13 @@
78  
79  SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.00 SOVERSION 2)
80  
81 -ADD_DEFINITIONS(-DUSE_THREADS)
82 -
83  if (APPLE)
84  ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS)
85  set(RESOURCE_PREFIX "Resources")
86  else (APPLE)
87  if (WIN32)
88  set (RESOURCE_PREFIX "Resources")
89 -ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS -DUSE_THREADS)
90 +ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS )
91  else(WIN32)
92  set (RESOURCE_PREFIX "share/projectM")
93  ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS)