From: <tj...@us...> - 2008-02-29 13:11:20
|
Revision: 10054 http://alleg.svn.sourceforge.net/alleg/?rev=10054&view=rev Author: tjaden Date: 2008-02-29 05:11:24 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Replace check of HAVE_D3DX9 (which was renamed to HAVE_D3D9) by SUPPORT_D3D. Remove reference to OPENGL_LIBS variable which is no longer defined. Modified Paths: -------------- allegro/branches/4.9/examples/CMakeLists.txt Modified: allegro/branches/4.9/examples/CMakeLists.txt =================================================================== --- allegro/branches/4.9/examples/CMakeLists.txt 2008-02-29 12:38:04 UTC (rev 10053) +++ allegro/branches/4.9/examples/CMakeLists.txt 2008-02-29 13:11:24 UTC (rev 10054) @@ -73,24 +73,22 @@ add_font_example(exnew_timer exnew_timer.c) endif(WANT_FONT) -if(WANT_D3D) - if (USE_CXX) - if(HAVE_D3DX9) - macro(add_d3dx_example nm) - add_executable(${nm} ${EXECUTABLE_TYPE} ${ARGN}) - set_target_properties(${nm} PROPERTIES - COMPILE_FLAGS "${MAYBE_ALLEGRO_STATICLINK}" - LINK_FLAGS "${MAYBE_ALLEGRO_STATICLINK}" - ) - target_link_libraries(${nm} ${LINK_WITH}) - target_link_libraries(${nm} d3dx9) - endmacro(add_d3dx_example) +if(SUPPORT_D3D) + macro(add_d3dx_example nm) + add_executable(${nm} ${EXECUTABLE_TYPE} ${ARGN}) + set_target_properties(${nm} PROPERTIES + COMPILE_FLAGS "${MAYBE_ALLEGRO_STATICLINK}" + LINK_FLAGS "${MAYBE_ALLEGRO_STATICLINK}" + ) + target_link_libraries(${nm} ${LINK_WITH}) + target_link_libraries(${nm} d3dx9) + endmacro(add_d3dx_example) - SET_SOURCE_FILES_PROPERTIES(exnew_d3d.cpp PROPERTIES LANGUAGE "CXX") - add_d3dx_example(exnew_d3d exnew_d3d.cpp) - endif(HAVE_D3DX9) + if (USE_CXX) + set_source_files_properties(exnew_d3d.cpp PROPERTIES LANGUAGE "CXX") + add_d3dx_example(exnew_d3d exnew_d3d.cpp) endif(USE_CXX) -endif(WANT_D3D) +endif(SUPPORT_D3D) if(SUPPORT_OPENGL) macro(add_ogl_example nm) @@ -100,7 +98,6 @@ LINK_FLAGS "${MAYBE_ALLEGRO_STATICLINK}" ) target_link_libraries(${nm} ${LINK_WITH}) - target_link_libraries(${nm} ${OPENGL_LIBS}) endmacro(add_ogl_example) add_ogl_example(exnew_opengl exnew_opengl.c) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |