Try to fix alt tab issue, some fixes for windows build

vovoid · Dec 28, 2016 · 7c05c6f · 7c05c6f
1 parent cdae950
commit 7c05c6f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/cmake/CMakeStandardIncludes.txt b/cmake/CMakeStandardIncludes.txt
@@ -1,6 +1,8 @@
 INCLUDE(FindPkgConfig)
+if(NOT WIN32)
 VSX_INCLUDE_LIB(FREETYPE freetype2 Freetype FREETYPE_INCLUDE_DIRS FREETYPE_LIBRARIES)
 VSX_INCLUDE_LIB(ZLIB zlib ZLIB ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES)
+endif()
 VSX_INCLUDE_LIB(GLEW glew GLEW GLEW_INCLUDE_DIRS GLEW_LIBRARIES)
 
 include_directories(

diff --git a/lib/engine_graphics/CMakeLists.txt b/lib/engine_graphics/CMakeLists.txt
@@ -65,6 +65,13 @@ include_directories(
 thirdparty/ftgl
 thirdparty/ftgl/src
 )
+if (WIN32)
+include_directories( thirdparty/freetype2/include )
+include_directories( thirdparty/freetype2/include/freetype )
+include_directories( thirdparty/freetype2/include/freetype/config )
+add_definitions( -DFTGL_LIBRARY_STATIC -DFT2_BUILD_LIBRARY)
+endif()
+
 set(SOURCES_FTGL
 thirdparty/ftgl/src/FTBuffer.cpp
 thirdparty/ftgl/src/FTCharmap.cpp

diff --git a/plugins/src/render.text/CMakeLists.txt b/plugins/src/render.text/CMakeLists.txt
@@ -8,6 +8,13 @@ project (${module_id})
 
 message("configuring vsxu module            " ${module_id})
 
+if (WIN32)
+include_directories( ${CMAKE_CURRENT_LIST_DIR}/../../../lib/engine_graphics/thirdparty/freetype2/include )
+include_directories( ${CMAKE_CURRENT_LIST_DIR}/../../../lib/engine_graphics/thirdparty/freetype2/include/freetype )
+include_directories( ${CMAKE_CURRENT_LIST_DIR}/../../../lib/engine_graphics/thirdparty/freetype2/include/freetype/config )
+add_definitions( -DFTGL_LIBRARY_STATIC -DFT2_BUILD_LIBRARY)
+endif()
+
 # set defines for MOD_CM, MOD_DM, MOD_NM
 CREATE_STATIC_GLUE(${module_id})
 

diff --git a/plugins/src/render.text/main_render.text.cpp b/plugins/src/render.text/main_render.text.cpp
@@ -288,6 +288,8 @@ void declare_params(vsx_module_param_list& in_parameters, vsx_module_param_list&
       return;
     }
 
+    if (text_in->get() == "_")
+      return;
 
 
     float obj_size = size->get();

diff --git a/programs/artiste/src/artiste_desktop.h b/programs/artiste/src/artiste_desktop.h
@@ -235,7 +235,7 @@ class vsx_artiste_desktop : public vsx_widget
 
     camera.event_key_up(key);
 
-    if (key ==  VSX_SCANCODE_TAB)
+    if (key ==  VSX_SCANCODE_TAB && !vsx_input_keyboard.pressed_alt() && !vsx_input_keyboard.pressed_ctrl() && !vsx_input_keyboard.pressed_shift())
       ((vsxu_assistant*)assistant)->toggle_size();
 
     return false;