# HG changeset patch # User koda # Date 1462251093 14400 # Node ID 64bbe89e59d609cc120c3ded335131822c162eb5 # Parent 80fe306460b2af6b8bb3709aae3273a65d924e5b Compile uMatrix to c too when GL2 is requested diff -r 80fe306460b2 -r 64bbe89e59d6 project_files/hwc/CMakeLists.txt --- a/project_files/hwc/CMakeLists.txt Mon May 02 23:28:58 2016 -0400 +++ b/project_files/hwc/CMakeLists.txt Tue May 03 00:51:33 2016 -0400 @@ -32,15 +32,15 @@ #get the list of pas files that are going to be converted and compiled file(GLOB engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/*.pas") -#TODO: temporary until cmake can configure itself accordingly -list(REMOVE_ITEM engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/uWeb.pas") list(REMOVE_ITEM engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/uVideoRec.pas") list(REMOVE_ITEM engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/uTouch.pas") list(REMOVE_ITEM engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/PNGh.pas") list(REMOVE_ITEM engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/pas2cSystem.pas") list(REMOVE_ITEM engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/pas2cRedo.pas") list(REMOVE_ITEM engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/hwLibrary.pas") -list(REMOVE_ITEM engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/uMatrix.pas") +if(NOT GL2) + list(REMOVE_ITEM engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/uMatrix.pas") +endif() #remove and readd hwengine so that it is compiled first, compiling every other file in the process list(REMOVE_ITEM engine_sources_pas ${CMAKE_SOURCE_DIR}/hedgewars/hwengine.pas)