Merge branch 'master' into opengl

2021-04-16 18:46:53 +03:00
parent 825dcd9fe4 82c5804188
commit 9dbbf8cf05
27 changed files with 397 additions and 188 deletions
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -51,6 +51,9 @@ ifeq ($(DEV_BUILD), y)
 ifndef I450KX
  I450KX		:= y
 endif
+ ifndef M154X
+  M145X		:= y
+ endif
 ifndef LASERXT
  LASERXT	:= y
 endif
@@ -130,6 +133,9 @@ else
 ifndef LASERXT
  LASERXT	:= n
 endif
+ ifndef M154X
+  M145X		:= n
+ endif
 ifndef MGA
  MGA		:= n
 endif