Merge branch 'master' into experimental

2017-05-18 13:17:44 -05:00
parent 3568cc7afb a4a69f71eb
commit 1b15d1416e
75 changed files with 637 additions and 545 deletions
--- a/src/VIDEO/vid_cga.c
+++ b/src/VIDEO/vid_cga.c
@@ -13,7 +13,7 @@
 #include "vid_cga.h"
 #include "vid_cga_comp.h"
 #ifndef __unix
-#include "../win-cgapal.h"
+# include "../win/win_cgapal.h"		/*YUCK*/
 #endif


--- a/src/VIDEO/vid_hercules.c
+++ b/src/VIDEO/vid_hercules.c
@@ -11,7 +11,7 @@
 #include "video.h"
 #include "vid_hercules.h"
 #ifndef __unix
-#include "../win-cgapal.h"
+# include "../win/win_cgapal.h"		/*YUCK*/
 #endif


--- a/src/VIDEO/vid_mda.c
+++ b/src/VIDEO/vid_mda.c
@@ -11,7 +11,7 @@
 #include "video.h"
 #include "vid_mda.h"
 #ifndef __unix
-#include "../win-cgapal.h"
+# include "../win/win_cgapal.h"		/*YUCK*/
 #endif


--- a/src/VIDEO/video.c
+++ b/src/VIDEO/video.c
@@ -17,7 +17,7 @@
 #include "video.h"
 #include "vid_svga.h"
 #ifndef __unix
-#include "../win-cgapal.h"
+# include "../win/win_cgapal.h"		/*YUCK*/
 #endif