Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 17:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GLU32]

Browse source 
* Fix linking in msvc build.
* Remove /OPT:NOWIN98 linker flag.

svn path=/trunk/; revision=52353
This commit is contained in:
Amine Khaldi 2011-06-18 22:51:34 +00:00
parent bb2bf33fc8
commit e0aea1f31b
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/glu32/CMakeLists.txt
View file

@ -109,7 +109,10 @@ list(APPEND SOURCE
add_library(glu32 SHARED ${SOURCE}) add_library(glu32 SHARED ${SOURCE})
set_entrypoint(glu32 0) set_entrypoint(glu32 0)
target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 oldnames)
if(NOT MSVC)
target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 oldnames)
endif()
add_importlibs(glu32 add_importlibs(glu32
opengl32 opengl32

2
reactos/dll/win32/glu32/include/gluos.h
View file

@ -108,9 +108,11 @@
#pragma warning(disable : 4761) #pragma warning(disable : 4761)
#endif #endif
/*
#if defined(_MSC_VER) && _MSC_VER >= 1200 #if defined(_MSC_VER) && _MSC_VER >= 1200
#pragma comment(linker, "/OPT:NOWIN98") #pragma comment(linker, "/OPT:NOWIN98")
#endif #endif
*/
#ifndef GLAPIENTRY #ifndef GLAPIENTRY
#define GLAPIENTRY APIENTRY #define GLAPIENTRY APIENTRY