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

Emit the correct LIBNAME to .pc files

Browse Source 
Irrespective of "FREEGLUT_REPLACE_GLUT" being set to "No" or being on
Win32 where this variable does not even exist, the .pc file contained
Libs: -L${libdir} -lglut

Instead, emit the correct value.
This commit is contained in:
Ray Donnelly 2016-01-08 16:46:01 +00:00
parent 575feb52b0
commit d06589f55c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
freeglut/freeglut/CMakeLists.txt
View File

@ -389,6 +389,7 @@ IF(FREEGLUT_BUILD_STATIC_LIBS)
ENDIF() ENDIF()
SET(LIBNAME freeglut)
IF(WIN32) IF(WIN32)
LIST(APPEND LIBS winmm) LIST(APPEND LIBS winmm)
IF(FREEGLUT_BUILD_SHARED_LIBS) IF(FREEGLUT_BUILD_SHARED_LIBS)
@ -424,8 +425,6 @@ ELSE()
ELSE() ELSE()
IF(FREEGLUT_REPLACE_GLUT) IF(FREEGLUT_REPLACE_GLUT)
SET(LIBNAME glut) SET(LIBNAME glut)
ELSE()
SET(LIBNAME freeglut)
ENDIF() ENDIF()
ENDIF() ENDIF()
@ -563,7 +562,7 @@ ELSE()
ENDIF() ENDIF()
# Client applications need to define FreeGLUT GLES version to # Client applications need to define FreeGLUT GLES version to
# bootstrap headers inclusion in freeglut_std.h: # bootstrap headers inclusion in freeglut_std.h:
SET(PC_LIBNAME "glut") SET(PC_LIBNAME ${LIBNAME})
SET(PC_FILENAME "freeglut.pc") SET(PC_FILENAME "freeglut.pc")
IF(FREEGLUT_GLES) IF(FREEGLUT_GLES)
SET(PC_CFLAGS "-DFREEGLUT_GLES") SET(PC_CFLAGS "-DFREEGLUT_GLES")