Consolidate AGL definitions in C

Previously, the only C code that required access to the Adobe Glyph List was
in the vector devices, so we kept the AGL definition with those. Otherwise
it was always in Postscript.

The PDF interpreter in C also requires the AGL, so move the AGL into base, and
give it its own ".dev".

Still to do: Remove the Postscript definition, and create the Postscript
definition(s) in PS VM from the C definition.

4 files changed, 21 insertions, 20 deletions

diff --git a/windows/ghostscript.vcproj b/windows/ghostscript.vcproj
index 44c736f43..d2d5b0ed8 100644
--- a/windows/ghostscript.vcproj
+++ b/windows/ghostscript.vcproj
@@ -1994,6 +1994,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\base\gsagl.c"
+				>
+			</File>
+			<File
 				RelativePath="..\base\gsalloc.c"
 				>
 			</File>
@@ -3418,6 +3422,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\base\gsagl.h"
+				>
+			</File>
+			<File
 				RelativePath="..\base\gsalloc.h"
 				>
 			</File>
@@ -5993,10 +6001,6 @@
 				Name="vector"
 				>
 				<File
-					RelativePath="..\devices\vector\gdevagl.c"
-					>
-				</File>
-				<File
 					RelativePath="..\devices\vector\gdevlj56.c"
 					>
 				</File>
@@ -6325,10 +6329,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\devices\vector\gdevagl.h"
-					>
-				</File>
-				<File
 					RelativePath="..\devices\vector\gdevpdfb.h"
 					>
 				</File>
diff --git a/windows/ghostscript.vcxproj b/windows/ghostscript.vcxproj
index 2623749ee..1f274cccf 100644
--- a/windows/ghostscript.vcxproj
+++ b/windows/ghostscript.vcxproj
@@ -1051,6 +1051,7 @@
     <ClCompile Include="..\base\gp_wpapr.c" />
     <ClCompile Include="..\base\gp_wsync.c" />
     <ClCompile Include="..\base\gp_wutf8.c" />
+    <ClCompile Include="..\base\gsagl.c" />
     <ClCompile Include="..\base\gsalloc.c" />
     <ClCompile Include="..\base\gsargs.c" />
     <ClCompile Include="..\base\gsbitcom.c" />
@@ -1561,7 +1562,6 @@
     <ClCompile Include="..\devices\rinkj\rinkj-dither.c" />
     <ClCompile Include="..\devices\rinkj\rinkj-epson870.c" />
     <ClCompile Include="..\devices\rinkj\rinkj-screen-eb.c" />
-    <ClCompile Include="..\devices\vector\gdevagl.c" />
     <ClCompile Include="..\devices\vector\gdevlj56.c" />
     <ClCompile Include="..\devices\vector\gdevpdf.c" />
     <ClCompile Include="..\devices\vector\gdevpdfb.c" />
@@ -2713,6 +2713,7 @@
     <ClInclude Include="..\base\gpsync.h" />
     <ClInclude Include="..\base\gp_mswin.h" />
     <ClInclude Include="..\base\gp_os2.h" />
+    <ClInclude Include="..\base\gsagl.h" />
     <ClInclude Include="..\base\gsalloc.h" />
     <ClInclude Include="..\base\gsargs.h" />
     <ClInclude Include="..\base\gsbitmap.h" />
@@ -3132,7 +3133,6 @@
     <ClInclude Include="..\devices\rinkj\rinkj-epson870.h" />
     <ClInclude Include="..\devices\rinkj\rinkj-screen-eb.h" />
     <ClInclude Include="..\devices\vector\doc_common.h" />
-    <ClInclude Include="..\devices\vector\gdevagl.h" />
     <ClInclude Include="..\devices\vector\gdevpdfb.h" />
     <ClInclude Include="..\devices\vector\gdevpdfc.h" />
     <ClInclude Include="..\devices\vector\gdevpdfg.h" />
@@ -3805,4 +3805,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/windows/ghostscript.vcxproj.filters b/windows/ghostscript.vcxproj.filters
index dc65eee96..9dfe05833 100644
--- a/windows/ghostscript.vcxproj.filters
+++ b/windows/ghostscript.vcxproj.filters
@@ -1688,6 +1688,9 @@
     <ClCompile Include="..\base\gpmisc.c">
       <Filter>base</Filter>
     </ClCompile>
+    <ClCompile Include="..\base\gsagl.c">
+      <Filter>base</Filter>
+    </ClCompile>
     <ClCompile Include="..\base\gsalloc.c">
       <Filter>base</Filter>
     </ClCompile>
@@ -2438,6 +2441,7 @@
     <ClCompile Include="..\base\gdevdevn.c">
       <Filter>base\color</Filter>
     </ClCompile>
+
     <ClCompile Include="..\base\gscdevn.c">
       <Filter>base\color</Filter>
     </ClCompile>
@@ -3302,9 +3306,6 @@
     <ClCompile Include="..\devices\minftrsz.c">
       <Filter>devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\devices\vector\gdevagl.c">
-      <Filter>devices\vector</Filter>
-    </ClCompile>
     <ClCompile Include="..\devices\vector\gdevlj56.c">
       <Filter>devices\vector</Filter>
     </ClCompile>
@@ -6745,7 +6746,10 @@
     <ClInclude Include="..\base\gs_mro_e.h">
       <Filter>base %28.h%29</Filter>
     </ClInclude>
-    <ClInclude Include="..\base\gsalloc.h">
+    <ClInclude Include="..\devices\vector\gsagl.h">
+      <Filter>base %28.h%29</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\a">
       <Filter>base %28.h%29</Filter>
     </ClInclude>
     <ClInclude Include="..\base\gsargs.h">
@@ -8017,9 +8021,6 @@
     <ClInclude Include="..\devices\minftrsz.h">
       <Filter>devices %28.h%29</Filter>
     </ClInclude>
-    <ClInclude Include="..\devices\vector\gdevagl.h">
-      <Filter>devices %28.h%29\vector %28.h%29</Filter>
-    </ClInclude>
     <ClInclude Include="..\devices\vector\gdevpdfb.h">
       <Filter>devices %28.h%29\vector %28.h%29</Filter>
     </ClInclude>
diff --git a/windows/ghostscript_rt.vcxproj b/windows/ghostscript_rt.vcxproj
index c5f8a4f3b..7589ac37c 100644
--- a/windows/ghostscript_rt.vcxproj
+++ b/windows/ghostscript_rt.vcxproj
@@ -716,6 +716,7 @@
     <ClCompile Include="..\base\gxblend.c" />
     <ClCompile Include="..\base\gxblend1.c" />
     <ClCompile Include="..\base\gdevdevn.c" />
+    <ClCompile Include="..\base\gsagl.c" />
     <ClCompile Include="..\base\gscdevn.c" />
     <ClCompile Include="..\base\gscie.c" />
     <ClCompile Include="..\base\gsciemap.c" />
@@ -1456,7 +1457,6 @@
     <ClCompile Include="..\devices\gdevxres.c" />
     <ClCompile Include="..\devices\gxfcopy.c" />
     <ClCompile Include="..\devices\minftrsz.c" />
-    <ClCompile Include="..\devices\vector\gdevagl.c" />
     <ClCompile Include="..\devices\vector\gdevlj56.c" />
     <ClCompile Include="..\devices\vector\gdevpdf.c" />
     <ClCompile Include="..\devices\vector\gdevpdfb.c" />
@@ -1669,6 +1669,7 @@
     <ClInclude Include="..\base\gs_dll_call.h" />
     <ClInclude Include="..\base\gs_mgl_e.h" />
     <ClInclude Include="..\base\gs_mro_e.h" />
+    <ClInclude Include="..\base\gsagl.h" />
     <ClInclude Include="..\base\gsalloc.h" />
     <ClInclude Include="..\base\gsalpha.h" />
     <ClInclude Include="..\base\gsargs.h" />
@@ -2174,7 +2175,6 @@
     <ClInclude Include="..\devices\gxfcopy.h" />
     <ClInclude Include="..\devices\minftrsz.h" />
     <ClInclude Include="..\devices\vector\doc_common.h" />
-    <ClInclude Include="..\devices\vector\gdevagl.h" />
     <ClInclude Include="..\devices\vector\gdevpdfb.h" />
     <ClInclude Include="..\devices\vector\gdevpdfc.h" />
     <ClInclude Include="..\devices\vector\gdevpdfg.h" />