RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Under CMake: Don't interrogate component libs that shouldn't be interrogated!

This commit is contained in:
Sam Edwards 2014-01-30 12:25:07 -07:00
parent c9a4228811
commit 4a9c9bf67c
5 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
panda/src/glgsg/CMakeLists.txt
View File

@ -12,5 +12,4 @@ if(HAVE_GL)
add_library(p3glgsg ${P3GLGSG_HEADERS} ${P3GLGSG_SOURCES})
target_link_libraries(p3glgsg p3glstuff p3display
${OPENGL_LIBRARIES} ${_CG_LIBRARIES})
target_interrogate(p3glgsg ALL)
endif()

5
panda/src/glstuff/CMakeLists.txt
View File

@ -32,6 +32,5 @@ if(HAVE_GL)
composite_sources(p3glstuff P3GLSTUFF_SOURCES)
add_library(p3glstuff ${P3GLSTUFF_HEADERS} ${P3GLSTUFF_SOURCES})
target_link_libraries(p3glstuff p3pandabase)
target_interrogate(p3glstuff ALL)
endif()
target_link_libraries(p3glstuff p3pandabase p3gobj)
endif()

1
panda/src/glxdisplay/CMakeLists.txt
View File

@ -23,5 +23,4 @@ if(HAVE_GLX)
composite_sources(p3glxdisplay P3GLXDISPLAY_SOURCES)
add_library(p3glxdisplay ${P3GLXDISPLAY_HEADERS} ${P3GLXDISPLAY_SOURCES})
target_link_libraries(p3glxdisplay p3glgsg p3x11display)
target_interrogate(p3glxdisplay ALL)
endif()

1
panda/src/pnmimagetypes/CMakeLists.txt
View File

@ -30,4 +30,3 @@ composite_sources(p3pnmimagetypes P3PNMIMAGETYPES_SOURCES)
add_library(p3pnmimagetypes ${P3PNMIMAGETYPES_HEADERS} ${P3PNMIMAGETYPES_SOURCES})
target_link_libraries(p3pnmimagetypes p3pnmimage ${_JPEG_LIBRARIES}
${_TIFF_LIBRARIES} ${_PNG_LIBRARIES})
target_interrogate(p3pnmimagetypes ALL)

1
panda/src/x11display/CMakeLists.txt
View File

@ -11,5 +11,4 @@ if(HAVE_X11)
composite_sources(p3x11display P3X11DISPLAY_SOURCES)
add_library(p3x11display ${P3X11DISPLAY_HEADERS} ${P3X11DISPLAY_SOURCES})
target_link_libraries(p3x11display p3display ${X11_LIBRARIES})
target_interrogate(p3x11display ALL)
endif()