 diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
-index 073dccf..d589691 100644
+index e404a08..9a9d33f 100644
 --- a/samples/CMakeLists.txt
 +++ b/samples/CMakeLists.txt
-@@ -226,6 +226,7 @@ endfunction()
- if (NOT ANDROID)
-     add_assimp_demo(frame_generator)
-     add_assimp_demo(gltf_viewer)
-+    add_assimp_demo(gltf_renderer)
+@@ -250,6 +250,7 @@ if (NOT ANDROID)
      add_assimp_demo(lightbulb)
      add_assimp_demo(material_sandbox)
      add_assimp_demo(sample_full_pbr)
-@@ -236,6 +237,7 @@ if (NOT ANDROID)
++    add_assimp_demo(gltf_renderer)
+ 
+     add_filamesh_demo(sample_cloth)
+     add_filamesh_demo(sample_normal_map)
+@@ -258,6 +259,7 @@ if (NOT ANDROID)
  
      # Sample app specific
      target_link_libraries(frame_generator PRIVATE imageio)
 +    target_link_libraries(gltf_renderer PRIVATE imageio)
      target_link_libraries(suzanne PRIVATE suzanne-resources)
+     target_link_libraries(gltf_viewer PRIVATE gltf-resources gltfio)
  endif()
- 
 diff --git a/samples/app/Config.h b/samples/app/Config.h
 index 8efe32d..a57cfda 100644
 --- a/samples/app/Config.h

                         case SDL_WINDOWEVENT_RESIZED:
                             window->resize();
                             break;
@@ -415,7 +430,7 @@ FilamentApp::Window::Window(FilamentApp* filamentApp,
         : mFilamentApp(filamentApp) {
     const int x = SDL_WINDOWPOS_CENTERED;
     const int y = SDL_WINDOWPOS_CENTERED;

     using SetupCallback = std::function<void(filament::Engine*, filament::View*, filament::Scene*)>;
     using CleanupCallback =
             std::function<void(filament::Engine*, filament::View*, filament::Scene*)>;
@@ -72,6 +73,13 @@ public:
             PostRenderCallback postRender = PostRenderCallback(),
             size_t width = 1024, size_t height = 640);
 
