# HG changeset patch # User John Tsiombikas # Date 1411233120 -10800 # Node ID 61feb366139718582b8a47cfa2bf55254725b7ba # Parent d12592558809a7270f1eca565b11caf0ae730ce6 windows build fix + new project file for the example diff -r d12592558809 -r 61feb3661397 example/example.vcxproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/example/example.vcxproj Sat Sep 20 20:12:00 2014 +0300 @@ -0,0 +1,88 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {7A7B8D81-EB77-49DA-B68D-B117C0A4782B} + Win32Proj + example + + + + Application + true + v120 + MultiByte + + + Application + false + v120 + true + MultiByte + + + + + + + + + + + + + true + + + false + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + $(SolutionDir)\src;%(AdditionalIncludeDirectories) + + + Console + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);libovr.lib;SDL2.lib;SDL2main.lib;opengl32.lib;glu32.lib;glew32.lib;libgoatvr.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + $(SolutionDir)\src;%(AdditionalIncludeDirectories) + + + Console + true + true + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);libovr.lib;SDL2.lib;SDL2main.lib;opengl32.lib;glu32.lib;glew32.lib;libgoatvr.lib + + + + + + + + + \ No newline at end of file diff -r d12592558809 -r 61feb3661397 example/example.vcxproj.filters --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/example/example.vcxproj.filters Sat Sep 20 20:12:00 2014 +0300 @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + src + + + \ No newline at end of file diff -r d12592558809 -r 61feb3661397 libgoatvr.sln --- a/libgoatvr.sln Sat Sep 20 16:52:42 2014 +0300 +++ b/libgoatvr.sln Sat Sep 20 20:12:00 2014 +0300 @@ -1,12 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30501.0 +VisualStudioVersion = 12.0.30723.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgoatvr", "libgoatvr.vcxproj", "{6AD69AF8-6F44-4D45-A59C-A7A07F6E1CE0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgoatvr_static", "libgoatvr_static.vcxproj", "{DF0FC238-A249-432C-9163-3778DDE78A62}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example\example.vcxproj", "{7A7B8D81-EB77-49DA-B68D-B117C0A4782B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -21,6 +23,10 @@ {DF0FC238-A249-432C-9163-3778DDE78A62}.Debug|Win32.Build.0 = Debug|Win32 {DF0FC238-A249-432C-9163-3778DDE78A62}.Release|Win32.ActiveCfg = Release|Win32 {DF0FC238-A249-432C-9163-3778DDE78A62}.Release|Win32.Build.0 = Release|Win32 + {7A7B8D81-EB77-49DA-B68D-B117C0A4782B}.Debug|Win32.ActiveCfg = Debug|Win32 + {7A7B8D81-EB77-49DA-B68D-B117C0A4782B}.Debug|Win32.Build.0 = Debug|Win32 + {7A7B8D81-EB77-49DA-B68D-B117C0A4782B}.Release|Win32.ActiveCfg = Release|Win32 + {7A7B8D81-EB77-49DA-B68D-B117C0A4782B}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff -r d12592558809 -r 61feb3661397 libgoatvr.vcxproj --- a/libgoatvr.vcxproj Sat Sep 20 16:52:42 2014 +0300 +++ b/libgoatvr.vcxproj Sat Sep 20 20:12:00 2014 +0300 @@ -52,7 +52,7 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGOATVR_EXPORTS;%(PreprocessorDefinitions);USE_LIBOVR - 4244;4996 + 4244;4996;4305 Windows @@ -76,7 +76,7 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGOATVR_EXPORTS;%(PreprocessorDefinitions);USE_LIBOVR - 4244;4996 + 4244;4996;4305 Windows @@ -95,6 +95,8 @@ + + @@ -105,6 +107,8 @@ + + diff -r d12592558809 -r 61feb3661397 libgoatvr.vcxproj.filters --- a/libgoatvr.vcxproj.filters Sat Sep 20 16:52:42 2014 +0300 +++ b/libgoatvr.vcxproj.filters Sat Sep 20 20:12:00 2014 +0300 @@ -31,6 +31,12 @@ src + + src + + + src + @@ -48,6 +54,12 @@ src + + src + + + src + diff -r d12592558809 -r 61feb3661397 libgoatvr_static.vcxproj --- a/libgoatvr_static.vcxproj Sat Sep 20 16:52:42 2014 +0300 +++ b/libgoatvr_static.vcxproj Sat Sep 20 20:12:00 2014 +0300 @@ -12,6 +12,8 @@ + + @@ -22,6 +24,8 @@ + + diff -r d12592558809 -r 61feb3661397 libgoatvr_static.vcxproj.filters --- a/libgoatvr_static.vcxproj.filters Sat Sep 20 16:52:42 2014 +0300 +++ b/libgoatvr_static.vcxproj.filters Sat Sep 20 20:12:00 2014 +0300 @@ -31,6 +31,12 @@ src + + src + + + src + @@ -48,5 +54,11 @@ src + + src + + + src + \ No newline at end of file diff -r d12592558809 -r 61feb3661397 src/opengl.c --- a/src/opengl.c Sat Sep 20 16:52:42 2014 +0300 +++ b/src/opengl.c Sat Sep 20 20:12:00 2014 +0300 @@ -23,7 +23,7 @@ void (*vrimp_glfunc(const char *name))() { - return wglGetProcAddress(name); + return (void (*)())wglGetProcAddress(name); } #endif /* WIN32 */