X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=9c687514c996ee5ed25fc37de8c7ba4cafc13a0e;hb=49b87c2f73988d791420821dafe0b05fd83fe714;hp=f8f180c6aa38b3c7a8f7ce889355f12250869b69;hpb=00a1f5e166e2943b328c6f9bff3dbc548efb2ce7;p=lugaru.git

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index f8f180c..9c68751 100644
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -19,6 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+
 #ifdef WIN32
 #define UINT8 WIN32API_UINT8
 #define UINT16 WIN32API_UINT16
@@ -35,7 +36,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 extern "C" {
 	#include "zlib.h"
 	#include "png.h"
-	#include "jpeglib.h"
+   #ifdef WIN32
+		#define INT32 INT32_jpeg
+		#include "jpeglib.h"
+		#undef INT32
+	#else
+		#include "jpeglib.h"
+	#endif
 }
 
 static bool load_image(const char * fname, TGAImageRec & tex);
@@ -110,11 +117,12 @@ extern float volume;
 #include "gamegl.h"
 #include "MacCompatibility.h"
 
+
 #ifdef WIN32
 #include <shellapi.h>
 #endif
 
-#include "res/resource.h"
+#include "win-res/resource.h"
 
 using namespace std;
 
@@ -1499,6 +1507,7 @@ int main(int argc, char **argv)
 		}
 	}
 
+
 	bool LoadImage(const char * fname, TGAImageRec & tex)
 	{
 		bool res = true;