Windows Port:

- Fix compiling issues. (Regression from r5162. Fixes bug #1468.)
- Fix crashing issue when selecting the OpenGL 3.2 renderer. Failure to init should now fallback properly. (Regression from r5180. Fixes bug #1470.)

desmume/src/OGLRender_3_2.cpp

@@ -91,13 +91,13 @@ void OGLLoadEntryPoints_3_2()
 	INITOGLEXT(PFNGLDELETERENDERBUFFERSPROC, glDeleteRenderbuffers) // Promote to core version
 	
 	// UBO
-	OGLEXT(PFNGLGETUNIFORMBLOCKINDEXPROC, glGetUniformBlockIndex)
-	OGLEXT(PFNGLUNIFORMBLOCKBINDINGPROC, glUniformBlockBinding)
-	OGLEXT(PFNGLBINDBUFFERBASEPROC, glBindBufferBase)
-	OGLEXT(PFNGLGETACTIVEUNIFORMBLOCKIVPROC, glGetActiveUniformBlockiv)
+	INITOGLEXT(PFNGLGETUNIFORMBLOCKINDEXPROC, glGetUniformBlockIndex)
+	INITOGLEXT(PFNGLUNIFORMBLOCKBINDINGPROC, glUniformBlockBinding)
+	INITOGLEXT(PFNGLBINDBUFFERBASEPROC, glBindBufferBase)
+	INITOGLEXT(PFNGLGETACTIVEUNIFORMBLOCKIVPROC, glGetActiveUniformBlockiv)
 	
 	// TBO
-	OGLEXT(PFNGLTEXBUFFERPROC, glTexBuffer)
+	INITOGLEXT(PFNGLTEXBUFFERPROC, glTexBuffer)
 }
 
 // Vertex shader for geometry, GLSL 1.50

desmume/src/windows/File_Extractor/fex/Rar_Extractor.h

@@ -5,7 +5,7 @@
 #define RAR_EXTRACTOR_H
 
 #include "File_Extractor.h"
-#include "unrar/unrar.h"
+#include "../unrar/unrar.h"
 
 class Rar_Extractor : public File_Extractor {
 public:

desmume/src/windows/File_Extractor/fex/Zip7_Extractor.cpp

@@ -3,9 +3,9 @@
 #include "Zip7_Extractor.h"
 
 extern "C" {
-#include "7z_C/7z.h"
-#include "7z_C/7zAlloc.h"
-#include "7z_C/7zCrc.h"
+#include "../7z_C/7z.h"
+#include "../7z_C/7zAlloc.h"
+#include "../7z_C/7zCrc.h"
 }
 
 #include <time.h>