diff --git a/3party/freetype/CMakeLists.txt b/3party/freetype/CMakeLists.txt index e803f1a275..15a4c05e3c 100644 --- a/3party/freetype/CMakeLists.txt +++ b/3party/freetype/CMakeLists.txt @@ -51,26 +51,27 @@ set( src/cache/ftcmanag.c src/cache/ftcmru.c src/cache/ftcsbits.c - src/cff/cf2ft.c - src/cff/cf2font.c - src/cff/cf2blues.c - src/cff/cf2intrp.c - src/cff/cf2stack.c + src/cache/ftstrokedcache.c src/cff/cf2arrst.c - src/cff/cf2hints.c + src/cff/cf2blues.c src/cff/cf2error.c + src/cff/cf2font.c + src/cff/cf2ft.c + src/cff/cf2hints.c + src/cff/cf2intrp.c src/cff/cf2read.c + src/cff/cf2stack.c src/cff/cffcmap.c src/cff/cffdrivr.c src/cff/cffgload.c src/cff/cffload.c src/cff/cffobjs.c src/cff/cffparse.c - src/cid/cidriver.c src/cid/cidgload.c src/cid/cidload.c src/cid/cidobjs.c src/cid/cidparse.c + src/cid/cidriver.c src/gzip/ftgzip.c src/lzw/ftlzw.c src/pcf/pcfdrivr.c @@ -106,25 +107,15 @@ set( src/sfnt/ttsbit.c src/smooth/ftgrays.c src/smooth/ftsmooth.c - src/truetype/ttdriver.c - src/truetype/ttgload.c - src/truetype/ttinterp.c - src/truetype/ttobjs.c - src/truetype/ttpload.c src/truetype/truetype.c - src/truetype/ttgxvar.c src/type1/t1afm.c src/type1/t1driver.c src/type1/t1gload.c src/type1/t1load.c src/type1/t1objs.c src/type1/t1parse.c - src/type42/t42drivr.c - src/type42/t42objs.c - src/type42/t42parse.c src/type42/type42.c src/winfonts/winfnt.c - src/cache/ftstrokedcache.c ) add_library(${PROJECT_NAME} ${SRC}) diff --git a/drape/CMakeLists.txt b/drape/CMakeLists.txt index cb9138cf9a..9ed1b04d18 100644 --- a/drape/CMakeLists.txt +++ b/drape/CMakeLists.txt @@ -137,58 +137,6 @@ if (PLATFORM_IOS) ) endif() -set( #might not need this declaration - OTHER_FILES - shaders/area3d_outline_vertex_shader.vsh - shaders/area3d_vertex_shader.vsh - shaders/area_vertex_shader.vsh - shaders/arrow3d_fragment_shader.fsh - shaders/arrow3d_shadow_fragment_shader.fsh - shaders/arrow3d_shadow_vertex_shader.vsh - shaders/arrow3d_vertex_shader.vsh - shaders/circle_shader.fsh - shaders/circle_shader.vsh - shaders/compass_vertex_shader.vsh - shaders/dashed_fragment_shader.fsh - shaders/dashed_vertex_shader.vsh - shaders/debug_rect_fragment_shader.fsh - shaders/debug_rect_vertex_shader.vsh - shaders/line_fragment_shader.fsh - shaders/line_vertex_shader.vsh - shaders/masked_texturing_billboard_vertex_shader.vsh - shaders/masked_texturing_fragment_shader.fsh - shaders/masked_texturing_vertex_shader.vsh - shaders/my_position_shader.vsh - shaders/path_symbol_vertex_shader.vsh - shaders/position_accuracy3d_shader.vsh - shaders/route_arrow_vertex_shader.vsh - shaders/route_dash_fragment_shader.fsh - shaders/route_fragment_shader.fsh - shaders/route_vertex_shader.vsh - shaders/ruler_vertex_shader.vsh - shaders/shader_index.txt - shaders/solid_color_fragment_shader.fsh - shaders/text_billboard_vertex_shader.vsh - shaders/text_fragment_shader.fsh - shaders/text_outlined_billboard_vertex_shader.vsh - shaders/text_outlined_gui_vertex_shader.vsh - shaders/text_outlined_vertex_shader.vsh - shaders/text_vertex_shader.vsh - shaders/texturing3d_fragment_shader.fsh - shaders/texturing3d_vertex_shader.vsh - shaders/texturing_billboard_vertex_shader.vsh - shaders/texturing_fragment_shader.fsh - shaders/texturing_vertex_shader.vsh - shaders/trackpoint_fragment_shader.fsh - shaders/trackpoint_vertex_shader.vsh - shaders/traffic_fragment_shader.fsh - shaders/traffic_vertex_shader.vsh - shaders/transparent_layer_fragment_shader.fsh - shaders/transparent_layer_vertex_shader.vsh - shaders/user_mark.vsh - shaders/user_mark_billboard.vsh -) - add_library(${PROJECT_NAME} ${DRAPE_COMMON_SRC} ${SRC}) omim_add_test_subdirectory(drape_tests)