Commits

Jason McKesson  committed 3295702 Merge

Merge with 0.2

  • Participants
  • Parent commits 2153ed0, c788eae

Comments (0)

Files changed (6)

File data/gl_specloaderfunc.lua

 
 #if defined(_WIN32)
 
+#ifdef _MSC_VER
 #pragma warning(disable: 4055)
 #pragma warning(disable: 4054)
+#endif
 
-static int TestPointer(const void *pTest)
+static int TestPointer(const PROC pTest)
 {
 	ptrdiff_t iTest;
 	if(!pTest) return 0;
 	return 1;
 }
 
-static void *WinGetProcAddress(const char *name)
+static PROC WinGetProcAddress(const char *name)
 {
 	HMODULE glMod = NULL;
-	void *pFunc = (void*)wglGetProcAddress((LPCSTR)name);
+	PROC pFunc = wglGetProcAddress((LPCSTR)name);
 	if(TestPointer(pFunc))
 	{
 		return pFunc;
 	}
 	glMod = GetModuleHandleA("OpenGL32.dll");
-	return (void*)GetProcAddress(glMod, (LPCSTR)name);
+	return (PROC)GetProcAddress(glMod, (LPCSTR)name);
 }
 	
 #define IntGetProcAddress(name) WinGetProcAddress(name)

File extfiles/gl_plat_3_3.txt

 -- These extensions are fairly widely implemented.
 
 NV_texture_barrier 
+NV_copy_image

File modules/StylePointerC.lua

File contents unchanged.

File modules/StylePointerCPP.lua

 #include <algorithm>
 #include <vector>
 #include <string.h>
-#ifdef WIN32
-#define strcasecmp(lhs, rhs) _stricmp((lhs), (rhs))
+#ifdef _MSC_VER
 #endif
 ]])
 end
 struct MapCompare
 {
 	MapCompare(const char *test_) : test(test_) {}
-	bool operator()(const MapEntry &other) { return strcasecmp(test, other.extName) == 0; }
+	bool operator()(const MapEntry &other) { return strcmp(test, other.extName) == 0; }
 	const char *test;
 };
 

File test/premake4.lua

 	UseLibs {"freeglut"}
 	
 	configuration "windows"
-		defines "WIN32"
+--		defines "WIN32"
 		links {"glu32", "opengl32", "gdi32", "winmm", "user32"}
 		
 	configuration "linux"

File test/test.cpp

File contents unchanged.