FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added check for FREEGLUT_DLL to allow static & DLL build on Windows.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@41 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dheyse 2002-12-10 15:39:54 +00:00
parent 55baab1f4e
commit cb0828db0e
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
freeglut/freeglut/include/GL/freeglut.h
View File

@ -36,7 +36,16 @@
* Under windows, we've got some issues to solve * Under windows, we've got some issues to solve
*/ */
#if defined(WIN32) #if defined(WIN32)
#if 0 # include <windows.h>
# include <windowsx.h>
# include <mmsystem.h>
# define WINDOWS
# pragma comment (lib, "winmm.lib") /* link with Windows MultiMedia lib */
# pragma comment (lib, "opengl32.lib") /* link with Microsoft OpenGL lib */
# pragma comment (lib, "glu32.lib") /* link with OpenGL Utility lib */
//#if defined(_USRDLL)
//# if defined(FREEGLUTLIB_EXPORTS)
#if defined(FREEGLUT_DLL)
# if defined(FREEGLUT_LIBRARY_BUILD) # if defined(FREEGLUT_LIBRARY_BUILD)
# define FGAPI __declspec(dllexport) # define FGAPI __declspec(dllexport)
# else # else
@ -44,19 +53,11 @@
# endif # endif
# define FGAPIENTRY __stdcall # define FGAPIENTRY __stdcall
#else #else
# include <windows.h>
# include <windowsx.h>
# include <mmsystem.h>
# define WINDOWS
# define FGAPI # define FGAPI
# define FGAPIENTRY # define FGAPIENTRY
# pragma comment (lib, "freeglut.lib") /* link with Win32 freeglut lib */
#endif #endif
#pragma comment (lib, "winmm.lib") /* link with Windows MultiMedia lib */
#pragma comment (lib, "opengl32.lib") /* link with Microsoft OpenGL lib */
#pragma comment (lib, "glu32.lib") /* link with OpenGL Utility lib */
#pragma comment (lib, "freeglut.lib") /* link with Win32 freeglut lib */
#else #else
# define FGAPI # define FGAPI
# define FGAPIENTRY # define FGAPIENTRY