diff options
| -rw-r--r-- | dispatch/d3dimports.hpp | 59 | ||||
| -rw-r--r-- | wrappers/ddrawtrace.py | 25 |
2 files changed, 60 insertions, 24 deletions
diff --git a/dispatch/d3dimports.hpp b/dispatch/d3dimports.hpp new file mode 100644 index 00000000..b70e2f4f --- /dev/null +++ b/dispatch/d3dimports.hpp @@ -0,0 +1,59 @@ +/************************************************************************** + * + * Copyright 2012 VMware, Inc. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + **************************************************************************/ + +/* + * Central place for all DDraw/D3D includes, and respective OS dependent headers. + */ + +#ifndef _D3DIMPORTS_HPP_ +#define _D3DIMPORTS_HPP_ + + +#include <windows.h> + +#include "compat.h" + +#include <ddraw.h> +#include <d3d.h> + + +#ifndef DDBLT_EXTENDED_FLAGS +#define DDBLT_EXTENDED_FLAGS 0x40000000l +#endif + +#ifndef DDBLT_EXTENDED_LINEAR_CONTENT +#define DDBLT_EXTENDED_LINEAR_CONTENT 0x00000004l +#endif + +#ifndef D3DLIGHT_PARALLELPOINT +#define D3DLIGHT_PARALLELPOINT (D3DLIGHTTYPE)4 +#endif + +#ifndef D3DLIGHT_GLSPOT +#define D3DLIGHT_GLSPOT (D3DLIGHTTYPE)5 +#endif + + +#endif /* _D3DIMPORTS_HPP_ */ diff --git a/wrappers/ddrawtrace.py b/wrappers/ddrawtrace.py index 4c436f59..c9fb71ec 100644 --- a/wrappers/ddrawtrace.py +++ b/wrappers/ddrawtrace.py @@ -31,30 +31,7 @@ from specs.d3d import ddraw, interfaces if __name__ == '__main__': print '#define INITGUID' - print '#include <windows.h>' - print '#include "compat.h"' - print '#include <ddraw.h>' - print '#include <d3d.h>' - print - print ''' - -#ifndef DDBLT_EXTENDED_FLAGS -#define DDBLT_EXTENDED_FLAGS 0x40000000l -#endif - -#ifndef DDBLT_EXTENDED_LINEAR_CONTENT -#define DDBLT_EXTENDED_LINEAR_CONTENT 0x00000004l -#endif - -#ifndef D3DLIGHT_PARALLELPOINT -#define D3DLIGHT_PARALLELPOINT (D3DLIGHTTYPE)4 -#endif - -#ifndef D3DLIGHT_GLSPOT -#define D3DLIGHT_GLSPOT (D3DLIGHTTYPE)5 -#endif - -''' + print '#include "d3dimports.hpp"' print '#include "trace_writer_local.hpp"' print '#include "os.hpp"' print |