* ptcpas: prefix all win32/win64 include files with 'win32' to avoid include file name duplications

git-svn-id: trunk@23008 -

.gitattributes

@@ -6135,43 +6135,43 @@ packages/ptc/src/ptcpas.cfg svneol=native#text/plain
 packages/ptc/src/ptcwrapper/ptceventqueue.pp svneol=native#text/plain
 packages/ptc/src/ptcwrapper/ptcwrapper.pp svneol=native#text/plain
 packages/ptc/src/tinyptc/tinyptc.pp svneol=native#text/plain
-packages/ptc/src/win32/base/cursor.inc svneol=native#text/plain
-packages/ptc/src/win32/base/cursord.inc svneol=native#text/plain
-packages/ptc/src/win32/base/cursormoded.inc svneol=native#text/plain
-packages/ptc/src/win32/base/event.inc svneol=native#text/plain
-packages/ptc/src/win32/base/eventd.inc svneol=native#text/plain
-packages/ptc/src/win32/base/hook.inc svneol=native#text/plain
-packages/ptc/src/win32/base/hookd.inc svneol=native#text/plain
-packages/ptc/src/win32/base/kbd.inc svneol=native#text/plain
-packages/ptc/src/win32/base/kbdd.inc svneol=native#text/plain
-packages/ptc/src/win32/base/monitor.inc svneol=native#text/plain
-packages/ptc/src/win32/base/monitord.inc svneol=native#text/plain
-packages/ptc/src/win32/base/moused.inc svneol=native#text/plain
-packages/ptc/src/win32/base/mousei.inc svneol=native#text/plain
 packages/ptc/src/win32/base/ptcres.rc -text
 packages/ptc/src/win32/base/ptcres.res -text
-packages/ptc/src/win32/base/window.inc svneol=native#text/plain
-packages/ptc/src/win32/base/windowd.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32cursor.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32cursord.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32cursormoded.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32event.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32eventd.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32hook.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32hookd.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32kbd.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32kbdd.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32monitor.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32monitord.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32moused.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32mousei.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32window.inc svneol=native#text/plain
+packages/ptc/src/win32/base/win32windowd.inc svneol=native#text/plain
 packages/ptc/src/win32/base/windows.ico -text
-packages/ptc/src/win32/directx/check.inc svneol=native#text/plain
-packages/ptc/src/win32/directx/directxconsoled.inc svneol=native#text/plain
-packages/ptc/src/win32/directx/directxconsolei.inc svneol=native#text/plain
-packages/ptc/src/win32/directx/display.inc svneol=native#text/plain
-packages/ptc/src/win32/directx/displayd.inc svneol=native#text/plain
-packages/ptc/src/win32/directx/hook.inc svneol=native#text/plain
-packages/ptc/src/win32/directx/hookd.inc svneol=native#text/plain
-packages/ptc/src/win32/directx/library.inc svneol=native#text/plain
-packages/ptc/src/win32/directx/libraryd.inc svneol=native#text/plain
 packages/ptc/src/win32/directx/p_ddraw.pp svneol=native#text/plain
-packages/ptc/src/win32/directx/primary.inc svneol=native#text/plain
-packages/ptc/src/win32/directx/primaryd.inc svneol=native#text/plain
-packages/ptc/src/win32/directx/translate.inc svneol=native#text/plain
-packages/ptc/src/win32/gdi/gdiconsoled.inc svneol=native#text/plain
-packages/ptc/src/win32/gdi/gdiconsolei.inc svneol=native#text/plain
-packages/ptc/src/win32/gdi/gdihookd.inc svneol=native#text/plain
-packages/ptc/src/win32/gdi/gdihooki.inc svneol=native#text/plain
+packages/ptc/src/win32/directx/win32directxcheck.inc svneol=native#text/plain
+packages/ptc/src/win32/directx/win32directxconsoled.inc svneol=native#text/plain
+packages/ptc/src/win32/directx/win32directxconsolei.inc svneol=native#text/plain
+packages/ptc/src/win32/directx/win32directxdisplay.inc svneol=native#text/plain
+packages/ptc/src/win32/directx/win32directxdisplayd.inc svneol=native#text/plain
+packages/ptc/src/win32/directx/win32directxhook.inc svneol=native#text/plain
+packages/ptc/src/win32/directx/win32directxhookd.inc svneol=native#text/plain
+packages/ptc/src/win32/directx/win32directxlibrary.inc svneol=native#text/plain
+packages/ptc/src/win32/directx/win32directxlibraryd.inc svneol=native#text/plain
+packages/ptc/src/win32/directx/win32directxprimary.inc svneol=native#text/plain
+packages/ptc/src/win32/directx/win32directxprimaryd.inc svneol=native#text/plain
+packages/ptc/src/win32/directx/win32directxtranslate.inc svneol=native#text/plain
 packages/ptc/src/win32/gdi/win32dibd.inc svneol=native#text/plain
 packages/ptc/src/win32/gdi/win32dibi.inc svneol=native#text/plain
+packages/ptc/src/win32/gdi/win32gdiconsoled.inc svneol=native#text/plain
+packages/ptc/src/win32/gdi/win32gdiconsolei.inc svneol=native#text/plain
+packages/ptc/src/win32/gdi/win32gdihookd.inc svneol=native#text/plain
+packages/ptc/src/win32/gdi/win32gdihooki.inc svneol=native#text/plain
 packages/ptc/src/win32/gdi/win32modesetterd.inc svneol=native#text/plain
 packages/ptc/src/win32/gdi/win32modesetteri.inc svneol=native#text/plain
 packages/ptc/src/win32/gdi/win32openglwindowd.inc svneol=native#text/plain

packages/ptc/fpmake.pp

@@ -106,7 +106,7 @@ begin
       AddInclude('x11dga1displayd.inc',allunixoses);
       AddInclude('x11dga2displayd.inc',allunixoses);
       AddInclude('x11consoled.inc',allunixoses);
-      AddInclude('check.inc',allunixoses + [win32, win64]);
+      AddInclude('check.inc',allunixoses);
       AddInclude('x11modesi.inc',allunixoses);
       AddInclude('x11imagei.inc',allunixoses);
       AddInclude('x11displayi.inc',allunixoses);
@@ -117,36 +117,37 @@ begin
       AddInclude('x11consolei.inc',allunixoses);
       AddInclude('glxfbconfigd.inc',allunixoses);
       AddInclude('glxfbconfigi.inc',allunixoses);
-      AddInclude('cursor.inc', [win32, win64]);
-      AddInclude('cursord.inc', [win32, win64]);
-      AddInclude('cursormoded.inc', [win32, win64]);
-      AddInclude('event.inc', [win32, win64]);
-      //AddInclude('eventd.inc', [win32, win64]);
-      AddInclude('hook.inc', [win32, win64]);
-      AddInclude('hookd.inc', [win32, win64]);
-      AddInclude('kbd.inc', [win32, win64]);
-      AddInclude('kbdd.inc', [win32, win64]);
-      AddInclude('monitor.inc', [win32, win64]);
-      AddInclude('monitord.inc', [win32, win64]);
-      AddInclude('moused.inc', [win32, win64]);
-      AddInclude('mousei.inc', [win32, win64]);
-      AddInclude('window.inc', [win32, win64]);
-      AddInclude('windowd.inc', [win32, win64]);
-      AddInclude('directxconsoled.inc', [win32, win64]);
-      AddInclude('directxconsolei.inc', [win32, win64]);
-      AddInclude('display.inc', [win32, win64]);
-      AddInclude('displayd.inc', [win32, win64]);
-      AddInclude('hook.inc', [win32, win64]);
-      AddInclude('hookd.inc', [win32, win64]);
-      AddInclude('library.inc', [win32, win64]);
-      AddInclude('libraryd.inc', [win32, win64]);
-      AddInclude('primary.inc', [win32, win64]);
-      AddInclude('primaryd.inc', [win32, win64]);
-      AddInclude('translate.inc', [win32, win64]);
-      AddInclude('gdiconsoled.inc', [win32, win64]);
-      AddInclude('gdiconsolei.inc', [win32, win64]);
-      AddInclude('gdihookd.inc', [win32, win64]);
-      AddInclude('gdihooki.inc', [win32, win64]);
+      AddInclude('win32cursor.inc', [win32, win64]);
+      AddInclude('win32cursord.inc', [win32, win64]);
+      AddInclude('win32cursormoded.inc', [win32, win64]);
+      AddInclude('win32event.inc', [win32, win64]);
+      AddInclude('win32eventd.inc', [win32, win64]);
+      AddInclude('win32hook.inc', [win32, win64]);
+      AddInclude('win32hookd.inc', [win32, win64]);
+      AddInclude('win32kbd.inc', [win32, win64]);
+      AddInclude('win32kbdd.inc', [win32, win64]);
+      AddInclude('win32monitor.inc', [win32, win64]);
+      AddInclude('win32monitord.inc', [win32, win64]);
+      AddInclude('win32moused.inc', [win32, win64]);
+      AddInclude('win32mousei.inc', [win32, win64]);
+      AddInclude('win32window.inc', [win32, win64]);
+      AddInclude('win32windowd.inc', [win32, win64]);
+      AddInclude('win32directxcheck.inc', [win32, win64]);
+      AddInclude('win32directxconsoled.inc', [win32, win64]);
+      AddInclude('win32directxconsolei.inc', [win32, win64]);
+      AddInclude('win32directxdisplay.inc', [win32, win64]);
+      AddInclude('win32directxdisplayd.inc', [win32, win64]);
+      AddInclude('win32directxhook.inc', [win32, win64]);
+      AddInclude('win32directxhookd.inc', [win32, win64]);
+      AddInclude('win32directxlibrary.inc', [win32, win64]);
+      AddInclude('win32directxlibraryd.inc', [win32, win64]);
+      AddInclude('win32directxprimary.inc', [win32, win64]);
+      AddInclude('win32directxprimaryd.inc', [win32, win64]);
+      AddInclude('win32directxtranslate.inc', [win32, win64]);
+      AddInclude('win32gdiconsoled.inc', [win32, win64]);
+      AddInclude('win32gdiconsolei.inc', [win32, win64]);
+      AddInclude('win32gdihookd.inc', [win32, win64]);
+      AddInclude('win32gdihooki.inc', [win32, win64]);
       AddInclude('win32dibd.inc', [win32, win64]);
       AddInclude('win32dibi.inc', [win32, win64]);
       AddInclude('win32modesetterd.inc', [win32, win64]);

packages/ptc/src/ptc.pp

@@ -187,44 +187,44 @@ end;
 {$ENDIF GO32V2}
 
 {$IF defined(Win32) OR defined(Win64)}
-{$INCLUDE win32/base/cursord.inc}
-{$INCLUDE win32/base/cursormoded.inc}
-{$INCLUDE win32/base/monitord.inc}
-{$INCLUDE win32/base/eventd.inc}
-{$INCLUDE win32/base/windowd.inc}
-{$INCLUDE win32/base/hookd.inc}
-{$INCLUDE win32/base/kbdd.inc}
-{$INCLUDE win32/base/moused.inc}
-{$INCLUDE win32/directx/hookd.inc}
-{$INCLUDE win32/directx/libraryd.inc}
-{$INCLUDE win32/directx/displayd.inc}
-{$INCLUDE win32/directx/primaryd.inc}
-{$INCLUDE win32/directx/directxconsoled.inc}
+{$INCLUDE win32/base/win32cursord.inc}
+{$INCLUDE win32/base/win32cursormoded.inc}
+{$INCLUDE win32/base/win32monitord.inc}
+{$INCLUDE win32/base/win32eventd.inc}
+{$INCLUDE win32/base/win32windowd.inc}
+{$INCLUDE win32/base/win32hookd.inc}
+{$INCLUDE win32/base/win32kbdd.inc}
+{$INCLUDE win32/base/win32moused.inc}
+{$INCLUDE win32/directx/win32directxhookd.inc}
+{$INCLUDE win32/directx/win32directxlibraryd.inc}
+{$INCLUDE win32/directx/win32directxdisplayd.inc}
+{$INCLUDE win32/directx/win32directxprimaryd.inc}
+{$INCLUDE win32/directx/win32directxconsoled.inc}
 {$INCLUDE win32/gdi/win32dibd.inc}
 {$INCLUDE win32/gdi/win32modesetterd.inc}
 {$INCLUDE win32/gdi/win32openglwindowd.inc}
-{$INCLUDE win32/gdi/gdihookd.inc}
-{$INCLUDE win32/gdi/gdiconsoled.inc}
-
-{$INCLUDE win32/base/cursor.inc}
-{$INCLUDE win32/base/monitor.inc}
-{$INCLUDE win32/base/event.inc}
-{$INCLUDE win32/base/window.inc}
-{$INCLUDE win32/base/hook.inc}
-{$INCLUDE win32/base/kbd.inc}
-{$INCLUDE win32/base/mousei.inc}
-{$INCLUDE win32/directx/check.inc}
-{$INCLUDE win32/directx/translate.inc}
-{$INCLUDE win32/directx/hook.inc}
-{$INCLUDE win32/directx/library.inc}
-{$INCLUDE win32/directx/display.inc}
-{$INCLUDE win32/directx/primary.inc}
-{$INCLUDE win32/directx/directxconsolei.inc}
+{$INCLUDE win32/gdi/win32gdihookd.inc}
+{$INCLUDE win32/gdi/win32gdiconsoled.inc}
+
+{$INCLUDE win32/base/win32cursor.inc}
+{$INCLUDE win32/base/win32monitor.inc}
+{$INCLUDE win32/base/win32event.inc}
+{$INCLUDE win32/base/win32window.inc}
+{$INCLUDE win32/base/win32hook.inc}
+{$INCLUDE win32/base/win32kbd.inc}
+{$INCLUDE win32/base/win32mousei.inc}
+{$INCLUDE win32/directx/win32directxcheck.inc}
+{$INCLUDE win32/directx/win32directxtranslate.inc}
+{$INCLUDE win32/directx/win32directxhook.inc}
+{$INCLUDE win32/directx/win32directxlibrary.inc}
+{$INCLUDE win32/directx/win32directxdisplay.inc}
+{$INCLUDE win32/directx/win32directxprimary.inc}
+{$INCLUDE win32/directx/win32directxconsolei.inc}
 {$INCLUDE win32/gdi/win32dibi.inc}
 {$INCLUDE win32/gdi/win32modesetteri.inc}
 {$INCLUDE win32/gdi/win32openglwindowi.inc}
-{$INCLUDE win32/gdi/gdihooki.inc}
-{$INCLUDE win32/gdi/gdiconsolei.inc}
+{$INCLUDE win32/gdi/win32gdihooki.inc}
+{$INCLUDE win32/gdi/win32gdiconsolei.inc}
 {$ENDIF defined(Win32) OR defined(Win64)}
 
 {$IFDEF WinCE}