mirror of
https://github.com/Perlmint/glew-cmake.git
synced 2025-03-23 00:56:48 +00:00
Merge https://github.com/nigels-com/glew.git into master HEAD at Fri Mar 6 00:00:50 GMT 2020
This commit is contained in:
commit
7d44f3c67c
@ -181,7 +181,11 @@ if (BUILD_UTILS)
|
|||||||
list (APPEND GLEWINFO_SRC_FILES ${GLEW_DIR}/build/glewinfo.rc)
|
list (APPEND GLEWINFO_SRC_FILES ${GLEW_DIR}/build/glewinfo.rc)
|
||||||
endif ()
|
endif ()
|
||||||
add_executable (glewinfo ${GLEWINFO_SRC_FILES})
|
add_executable (glewinfo ${GLEWINFO_SRC_FILES})
|
||||||
target_link_libraries (glewinfo glew)
|
if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
|
||||||
|
target_link_libraries (glewinfo glew)
|
||||||
|
else()
|
||||||
|
target_link_libraries (glewinfo glew_s)
|
||||||
|
endif()
|
||||||
if (NOT WIN32)
|
if (NOT WIN32)
|
||||||
target_link_libraries(glewinfo ${X11_LIBRARIES})
|
target_link_libraries(glewinfo ${X11_LIBRARIES})
|
||||||
endif ()
|
endif ()
|
||||||
@ -191,7 +195,11 @@ if (BUILD_UTILS)
|
|||||||
list (APPEND VISUALINFO_SRC_FILES ${GLEW_DIR}/build/visualinfo.rc)
|
list (APPEND VISUALINFO_SRC_FILES ${GLEW_DIR}/build/visualinfo.rc)
|
||||||
endif ()
|
endif ()
|
||||||
add_executable (visualinfo ${VISUALINFO_SRC_FILES})
|
add_executable (visualinfo ${VISUALINFO_SRC_FILES})
|
||||||
target_link_libraries (visualinfo glew)
|
if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
|
||||||
|
target_link_libraries (visualinfo glew)
|
||||||
|
else()
|
||||||
|
target_link_libraries (visualinfo glew_s)
|
||||||
|
endif()
|
||||||
if (NOT WIN32)
|
if (NOT WIN32)
|
||||||
target_link_libraries(visualinfo ${X11_LIBRARIES})
|
target_link_libraries(visualinfo ${X11_LIBRARIES})
|
||||||
endif ()
|
endif ()
|
||||||
@ -214,9 +222,9 @@ if (APPLE)
|
|||||||
set (requireslib)
|
set (requireslib)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
configure_file (${GLEW_DIR}/glew.pc.in ${GLEW_DIR}/glew.pc @ONLY)
|
configure_file (${GLEW_DIR}/glew.pc.in ${CMAKE_CURRENT_BINARY_DIR}/glew.pc @ONLY)
|
||||||
|
|
||||||
install(FILES ${GLEW_DIR}/glew.pc
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/glew.pc
|
||||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
|
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
|
||||||
)
|
)
|
||||||
|
|
||||||
|
24
config/Makefile.flatpak-32
Normal file
24
config/Makefile.flatpak-32
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
NAME = $(GLEW_NAME)
|
||||||
|
CC = /usr/lib/sdk/toolchain-i386/bin/i686-unknown-linux-gnu-gcc -m32 -L/lib/i386-linux-gnu
|
||||||
|
LD = /usr/lib/sdk/toolchain-i386/bin/i686-unknown-linux-gnu-gcc -m32 -L/lib/i386-linux-gnu
|
||||||
|
LDFLAGS.EXTRA += -m32
|
||||||
|
LDFLAGS.EXTRA += -L/lib/i386-linux-gnu
|
||||||
|
LIBDIR = $(GLEW_DEST)/lib32
|
||||||
|
LDFLAGS.GL = -lGL -lX11
|
||||||
|
LDFLAGS.STATIC = -Wl,-Bstatic
|
||||||
|
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
||||||
|
WARN += -Wall -W
|
||||||
|
WARN += -Wshadow
|
||||||
|
WARN += -pedantic
|
||||||
|
POPT = -O2
|
||||||
|
CFLAGS.EXTRA += -m32
|
||||||
|
CFLAGS.EXTRA += -fPIC
|
||||||
|
CFLAGS.EXTRA += -Wcast-qual
|
||||||
|
CFLAGS.EXTRA += -ansi -pedantic
|
||||||
|
CFLAGS.EXTRA += -fno-stack-protector
|
||||||
|
BIN.SUFFIX =
|
||||||
|
LIB.SONAME = lib$(NAME).so.$(SO_MAJOR)
|
||||||
|
LIB.DEVLNK = lib$(NAME).so
|
||||||
|
LIB.SHARED = lib$(NAME).so.$(SO_VERSION)
|
||||||
|
LIB.STATIC = lib$(NAME).a
|
||||||
|
LDFLAGS.SO = -m32 -shared -Wl,-soname=$(LIB.SONAME)
|
Loading…
Reference in New Issue
Block a user