update my Qt Creator project

contrib/a1batross/xash3d.config

@@ -1,2 +1,3 @@
 // Add predefined macros for your project here. For example:
 // #define THE_ANSWER 42
+#define XASH_SDL

contrib/a1batross/xash3d.creator.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.5.1, 2018-05-29T00:57:38. -->
+<!-- Written by QtCreator 4.5.2, 2018-10-21T21:41:59. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -70,7 +70,7 @@
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">configure --vgui=vgui-dev --win-style-install</value>
+      <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">configure --vgui=vgui-dev --win-style-install --prefix=/home/a1ba/projects/builtXash</value>
       <value type="QString" key="ProjectExplorer.ProcessStep.Command">./waf</value>
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Особый</value>
@@ -112,7 +112,9 @@
     </valuemap>
     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
     <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges">
+     <value type="QString">PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig</value>
+    </valuelist>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">По умолчанию</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">По умолчанию</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericBuildConfiguration</value>
@@ -122,7 +124,7 @@
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">install --destdir=/home/a1ba/projects/builtXash</value>
+      <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">install</value>
       <value type="QString" key="ProjectExplorer.ProcessStep.Command">./waf</value>
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Особый</value>

contrib/a1batross/xash3d.files

@@ -1,5 +1,6 @@
 common/backends.h
 common/beamdef.h
+common/boneinfo.h
 common/bspfile.h
 common/cl_entity.h
 common/com_model.h
@@ -48,8 +49,8 @@ engine/client/avi/avi_stub.c
 engine/client/avi/avi_win.c
 engine/client/cl_cmds.c
 engine/client/cl_custom.c
-engine/client/cl_demo.c
 engine/client/cl_debug.c
+engine/client/cl_demo.c
 engine/client/cl_events.c
 engine/client/cl_frame.c
 engine/client/cl_game.c
@@ -59,13 +60,13 @@ engine/client/cl_mobile.c
 engine/client/cl_netgraph.c
 engine/client/cl_parse.c
 engine/client/cl_pmove.c
+engine/client/cl_qparse.c
 engine/client/cl_remap.c
 engine/client/cl_scrn.c
 engine/client/cl_tent.c
 engine/client/cl_tent.h
 engine/client/cl_video.c
 engine/client/cl_view.c
-engine/client/cl_qparse.c
 engine/client/client.h
 engine/client/console.c
 engine/client/gl_alias.c
@@ -95,6 +96,7 @@ engine/client/in_touch.c
 engine/client/input.c
 engine/client/input.h
 engine/client/keys.c
+engine/client/mod_dbghulls.c
 engine/client/s_dsp.c
 engine/client/s_load.c
 engine/client/s_main.c
@@ -107,6 +109,7 @@ engine/client/sound.h
 engine/client/titles.c
 engine/client/vgui/vgui_draw.c
 engine/client/vgui/vgui_draw.h
+engine/client/vgui/vgui_main.h
 engine/client/vid_common.c
 engine/client/vid_common.h
 engine/client/vox.h
@@ -145,14 +148,12 @@ engine/common/imagelib/img_wad.c
 engine/common/infostring.c
 engine/common/launcher.c
 engine/common/lib_common.c
-engine/common/lib_posix.c
 engine/common/library.h
+engine/common/masterlist.c
 engine/common/mathlib.c
 engine/common/mathlib.h
 engine/common/matrixlib.c
-engine/common/masterlist.c
 engine/common/mod_bmodel.c
-engine/common/mod_dbghulls.c
 engine/common/mod_local.h
 engine/common/mod_studio.c
 engine/common/model.c
@@ -212,18 +213,21 @@ engine/keydefs.h
 engine/menu_int.h
 engine/mobility_int.h
 engine/physint.h
-engine/platform/android/android_lib.c
+engine/platform/android/lib_android.c
-engine/platform/android/android_lib.h
+engine/platform/android/lib_android.h
-engine/platform/apple/ios_lib.c
+engine/platform/apple/lib_ios.c
-engine/platform/apple/ios_lib.h
+engine/platform/apple/lib_ios.h
-engine/platform/emscripten/em_lib.c
+engine/platform/emscripten/lib_em.c
-engine/platform/emscripten/em_lib.h
+engine/platform/emscripten/lib_em.h
+engine/platform/platform.h
+engine/platform/posix/lib_posix.c
 engine/platform/sdl/events.c
 engine/platform/sdl/events.h
-engine/platform/sdl/s_backend.c
+engine/platform/sdl/in_sdl.c
+engine/platform/sdl/s_sdl.c
 engine/platform/sdl/vid_sdl.c
-engine/platform/win32/win_con.c
+engine/platform/win32/con_win.c
-engine/platform/win32/win_lib.c
+engine/platform/win32/lib_win.c
 engine/progdefs.h
 engine/sequence.h
 engine/server/server.h
@@ -247,8 +251,10 @@ engine/vgui_api.h
 engine/warpsin.h
 engine/wscript
 game_launch/game.cpp
+game_launch/game.rc
 game_launch/wscript
-mainui/wscript
+mainui/Android.mk
+mainui/BMPUtils.h
 mainui/BaseMenu.cpp
 mainui/BaseMenu.h
 mainui/Btns.cpp
@@ -272,6 +278,8 @@ mainui/controls/Action.cpp
 mainui/controls/Action.h
 mainui/controls/BackgroundBitmap.cpp
 mainui/controls/BackgroundBitmap.h
+mainui/controls/BaseClientWindow.cpp
+mainui/controls/BaseClientWindow.h
 mainui/controls/BaseItem.cpp
 mainui/controls/BaseItem.h
 mainui/controls/BaseWindow.cpp
@@ -318,6 +326,7 @@ mainui/font/BitmapFont.cpp
 mainui/font/BitmapFont.h
 mainui/font/FontManager.cpp
 mainui/font/FontManager.h
+mainui/font/FontRenderer.h
 mainui/font/FreeTypeFont.cpp
 mainui/font/FreeTypeFont.h
 mainui/font/StbFont.cpp
@@ -366,9 +375,12 @@ mainui/model/BaseArrayModel.h
 mainui/model/BaseModel.h
 mainui/model/StringArrayModel.h
 mainui/udll_int.cpp
+mainui/utl/unicode_strtools.cpp
+mainui/utl/unicode_strtools.h
 mainui/utl/utlmemory.h
 mainui/utl/utlrbtree.h
 mainui/utl/utlvector.h
+mainui/wscript
 pm_shared/pm_defs.h
 pm_shared/pm_info.h
 pm_shared/pm_movevars.h

contrib/a1batross/xash3d.includes

@@ -6,10 +6,6 @@ engine/common
 engine/common/imagelib
 engine/common/soundlib
 engine/common/soundlib/libmpg
-engine/platform/android
-engine/platform/apple
-engine/platform/emscripten
-engine/platform/sdl
 engine/server
 mainui
 mainui/controls
@@ -20,3 +16,4 @@ mainui/utl
 pm_shared
 vgui_support
 common
+/usr/include/SDL2