fix windows

Vankata453 · Apr 25, 2024 · f915887 · f915887
1 parent 9424cb7
commit f915887
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/mk/cmake/SuperTux/ProvideSimpleSquirrel.cmake b/mk/cmake/SuperTux/ProvideSimpleSquirrel.cmake
@@ -1,2 +1,6 @@
 add_subdirectory("${CMAKE_SOURCE_DIR}/external/simplesquirrel/")
-add_library(LibSimpleSquirrel ALIAS simplesquirrel)
+if(MSVC)
+  add_library(LibSimpleSquirrel ALIAS simplesquirrel_static)
+else()
+  add_library(LibSimpleSquirrel ALIAS simplesquirrel)
+endif()
diff --git a/src/object/camera.cpp b/src/object/camera.cpp
@@ -807,7 +807,7 @@ Camera::scroll_to(float x, float y, float scrolltime)
 void
 Camera::set_scale(float scale)
 {
-  ease_scale(scale, 0, "");
+  m_scale = scale;
 }
 
 void

diff --git a/src/object/camera.hpp b/src/object/camera.hpp
@@ -125,9 +125,6 @@ class Camera final : public GameObject,
   /** get the scale towards which the camera is moving */
   float get_target_scale() const { return m_scale_target; }
 
-  /** Instantly set the scale of the camera */
-  void set_scale(float scale) { m_scale = scale; }
-
   /** smoothly slide the scale and anchor position of the camera towards a new value */
   void ease_scale(float scale, float time, easing ease, AnchorPoint anchor = AnchorPoint::ANCHOR_MIDDLE);
   /** @} */