windows.py -> winapi.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30befd3..99dde68 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,7 +95,7 @@ if (WIN32)
        #       add_custom_command (
        #               OUTPUT d3d8.cpp
        #               COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8.cpp
-       #               DEPENDS d3d8.py d3d8types.py d3d8caps.py windows.py base.py
+       #               DEPENDS d3d8.py d3d8types.py d3d8caps.py winapi.py base.py
        #       )
        #       add_library (d3d8 SHARED d3d8.def d3d8.cpp log.cpp os_win32.cpp)
        #       set_target_properties (d3d8 PROPERTIES PREFIX "")
@@ -107,7 +107,7 @@ if (WIN32)
        #       add_custom_command (
        #               OUTPUT d3d9.cpp
        #               COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9.cpp
-       #               DEPENDS d3d9.py d3d9types.py d3d9caps.py d3dshader.py windows.py base.py
+       #               DEPENDS d3d9.py d3d9types.py d3d9caps.py d3dshader.py winapi.py base.py
        #       )
        #       add_library (d3d9 SHARED d3d9.def d3d9.cpp log.cpp os_win32.cpp)
        #       set_target_properties (d3d9 PROPERTIES PREFIX "")
@@ -119,7 +119,7 @@ if (WIN32)
        #       add_custom_command (
        #               OUTPUT d3d10.cpp
        #               COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10misc.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10.cpp
-       #               DEPENDS d3d10misc.py windows.py base.py
+       #               DEPENDS d3d10misc.py winapi.py base.py
        #       )
        #       add_library (d3d10 SHARED d3d10.def d3d10.cpp log.cpp os_win32.cpp)
        #       set_target_properties (d3d10 PROPERTIES PREFIX "")
@@ -129,7 +129,7 @@ if (WIN32)
        add_custom_command (
                OUTPUT opengl32.cpp
                COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/opengl32.py > ${CMAKE_CURRENT_BINARY_DIR}/opengl32.cpp
-               DEPENDS opengl32.py trace.py wglapi.py glapi.py windows.py base.py
+               DEPENDS opengl32.py trace.py wglapi.py glapi.py winapi.py base.py
        )
        add_library (opengl SHARED opengl32.def opengl32.cpp log.cpp os_win32.cpp)
        set_target_properties (opengl PROPERTIES

diff --git a/d3d.py b/d3d.py
index 7b71158..f5b7638 100644 (file)
--- a/d3d.py
+++ b/d3d.py
@@ -25,7 +25,7 @@
 
 """d3d.h"""
 
-from windows import *
+from winapi import *
 from d3dtypes import *
 from d3dcaps import *
 

diff --git a/d3d10_1.py b/d3d10_1.py
index b9fa9f9..14420da 100644 (file)
--- a/d3d10_1.py
+++ b/d3d10_1.py
@@ -25,7 +25,7 @@
 
 """d3d10_1.h"""
 
-from windows import *
+from winapi import *
 
 ID3D10Blob = Interface("ID3D10Blob", IUnknown)
 LPD3D10BLOB = Pointer(ID3D10Blob)

diff --git a/d3d10misc.py b/d3d10misc.py
index 9e81b51..9396a56 100644 (file)
--- a/d3d10misc.py
+++ b/d3d10misc.py
@@ -25,7 +25,7 @@
 
 """d3d10misc.h"""
 
-from windows import *
+from winapi import *
 
 ID3D10Blob = Interface("ID3D10Blob", IUnknown)
 LPD3D10BLOB = Pointer(ID3D10Blob)

diff --git a/d3d8.py b/d3d8.py
index a4f1f34..7204554 100644 (file)
--- a/d3d8.py
+++ b/d3d8.py
@@ -25,7 +25,7 @@
 
 """d3d8.h"""
 
-from windows import *
+from winapi import *
 from d3d8types import *
 from d3d8caps import *
 

diff --git a/d3d8caps.py b/d3d8caps.py
index 36a332e..87e7625 100644 (file)
--- a/d3d8caps.py
+++ b/d3d8caps.py
@@ -25,7 +25,7 @@
 
 """d3d8caps.h"""
 
-from windows import *
+from winapi import *
 from d3d8types import *
 
 D3DCAPS = Flags(DWORD, [

diff --git a/d3d8types.py b/d3d8types.py
index 9f87b82..96e3d84 100644 (file)
--- a/d3d8types.py
+++ b/d3d8types.py
@@ -25,7 +25,7 @@
 
 """d3d8types.h"""
 
-from windows import *
+from winapi import *
 
 D3DCOLOR = Alias("D3DCOLOR", DWORD)
 

diff --git a/d3d9.py b/d3d9.py
index 55f3dcd..4e1da90 100644 (file)
--- a/d3d9.py
+++ b/d3d9.py
@@ -25,7 +25,7 @@
 
 """d3d9.h"""
 
-from windows import *
+from winapi import *
 from d3dshader import *
 from d3d9types import *
 from d3d9caps import *

diff --git a/d3d9caps.py b/d3d9caps.py
index 195052b..5140514 100644 (file)
--- a/d3d9caps.py
+++ b/d3d9caps.py
@@ -25,7 +25,7 @@
 
 """d3d9caps.h"""
 
-from windows import *
+from winapi import *
 from d3d9types import *
 
 D3DVS20CAPS = Flags(DWORD, [

diff --git a/d3d9types.py b/d3d9types.py
index cef8bd7..239f750 100644 (file)
--- a/d3d9types.py
+++ b/d3d9types.py
@@ -25,7 +25,7 @@
 
 """d3d9types.h"""
 
-from windows import *
+from winapi import *
 
 D3DCOLOR = Alias("D3DCOLOR", DWORD)
 

diff --git a/d3dcaps.py b/d3dcaps.py
index 50ca351..6096826 100644 (file)
--- a/d3dcaps.py
+++ b/d3dcaps.py
@@ -25,7 +25,7 @@
 
 """d3dcaps.h"""
 
-from windows import *
+from winapi import *
 from d3dtypes import *
 
 D3DTRANSFORMCAPS = Flags(DWORD, [

diff --git a/d3dtypes.py b/d3dtypes.py
index 2f51783..07c70a3 100644 (file)
--- a/d3dtypes.py
+++ b/d3dtypes.py
@@ -25,7 +25,7 @@
 
 """d3dtypes.h"""
 
-from windows import *
+from winapi import *
 from ddraw import *
 
 D3DVALUE = Float

diff --git a/ddraw.py b/ddraw.py
index d04ae90..bc1f8f2 100644 (file)
--- a/ddraw.py
+++ b/ddraw.py
@@ -25,7 +25,7 @@
 
 """ddraw.h"""
 
-from windows import *
+from winapi import *
 
 IDirectDraw = Interface("IDirectDraw", IUnknown)
 IDirectDraw2 = Interface("IDirectDraw2", IUnknown)

diff --git a/wglapi.py b/wglapi.py
index 79128ac..e5611b2 100644 (file)
--- a/wglapi.py
+++ b/wglapi.py
@@ -25,7 +25,7 @@
 
 
 from glapi import *
-from windows import *
+from winapi import *
 
 
 wglapi = API("WGL")

diff --git a/windows.py b/winapi.py
similarity index 99%
rename from windows.py
rename to winapi.py
index 208961f..eec3fde 100644 (file)
--- a/windows.py
+++ b/winapi.py
@@ -23,7 +23,7 @@
 #
 ##########################################################################/
 
-"""windows.h"""
+"""Win32 API type description."""
 
 from base import *