DXGL r339 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:r338‎ | r339 | r340 >
Date:01:25, 27 February 2013
Author:admin
Status:new
Tags:
Comment:
Fix build error.
Modified paths:
  • /cfgmgr/ReadMe.txt (modified) (history)
  • /ddraw/ddraw.vcxproj (modified) (history)
  • /ddraw/ddraw.vcxproj.filters (modified) (history)
  • /ddraw/trace.c (deleted) (history)
  • /ddraw/trace.cpp (added) (history)
  • /ddraw/trace.h (modified) (history)

Diff [purge]

Index: ddraw/trace.c
@@ -1,32 +0,0 @@
2 -// DXGL
3 -// Copyright (C) 2013 William Feely
4 -
5 -// This library is free software; you can redistribute it and/or
6 -// modify it under the terms of the GNU Lesser General Public
7 -// License as published by the Free Software Foundation; either
8 -// version 2.1 of the License, or (at your option) any later version.
9 -
10 -// This library is distributed in the hope that it will be useful,
11 -// but WITHOUT ANY WARRANTY; without even the implied warranty of
12 -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 -// Lesser General Public License for more details.
14 -
15 -// You should have received a copy of the GNU Lesser General Public
16 -// License along with this library; if not, write to the Free Software
17 -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18 -
19 -#include "common.h"
20 -#include "trace.h"
21 -
22 -#ifdef _TRACE
23 -HANDLE outfile = INVALID_HANDLE_VALUE;
24 -void TRACE_ENTER(const char *function, int argtype, void *arg, int end)
25 -{
26 -}
27 -void TRACE_ARG(int argtype, void *arg, int end)
28 -{
29 -}
30 -void TRACE_EXIT(const char *function, int argtype, void *arg)
31 -{
32 -}
33 -#endif
\ No newline at end of file
Index: cfgmgr/ReadMe.txt
@@ -119,4 +119,11 @@
120120 Method used to upload textures
121121 Valid settings:
122122 0 - Automatic
123 -1 - OpenGL Standard
\ No newline at end of file
 123+1 - OpenGL Standard
 124+
 125+Member Windows8Detected
 126+REG_DWORD HKCU\DXGL\Global\Windows8Detected
 127+Nonzero if Windows 8 (or later) is detected.
 128+If zero or undefined and Windows 8 (or later) is detected, AllColorDepths in
 129+Global key is set to 1 and Windows8Detected is also set to 1.
 130+If nonzero, AllColorDepths is not affected.
\ No newline at end of file
Index: ddraw/ddraw.vcxproj
@@ -360,7 +360,7 @@
361361 <ClCompile Include="shadergen.cpp" />
362362 <ClCompile Include="shaders.cpp" />
363363 <ClCompile Include="texture.cpp" />
364 - <ClCompile Include="trace.c" />
 364+ <ClCompile Include="trace.cpp" />
365365 </ItemGroup>
366366 <ItemGroup>
367367 <ResourceCompile Include="ddraw.rc" />
Index: ddraw/ddraw.vcxproj.filters
@@ -211,7 +211,7 @@
212212 <ClCompile Include="glDirect3DExecuteBuffer.cpp">
213213 <Filter>Source Files</Filter>
214214 </ClCompile>
215 - <ClCompile Include="trace.c">
 215+ <ClCompile Include="trace.cpp">
216216 <Filter>Source Files</Filter>
217217 </ClCompile>
218218 </ItemGroup>
Index: ddraw/trace.cpp
@@ -0,0 +1,32 @@
 2+// DXGL
 3+// Copyright (C) 2013 William Feely
 4+
 5+// This library is free software; you can redistribute it and/or
 6+// modify it under the terms of the GNU Lesser General Public
 7+// License as published by the Free Software Foundation; either
 8+// version 2.1 of the License, or (at your option) any later version.
 9+
 10+// This library is distributed in the hope that it will be useful,
 11+// but WITHOUT ANY WARRANTY; without even the implied warranty of
 12+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 13+// Lesser General Public License for more details.
 14+
 15+// You should have received a copy of the GNU Lesser General Public
 16+// License along with this library; if not, write to the Free Software
 17+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 18+
 19+#include "common.h"
 20+#include "trace.h"
 21+
 22+#ifdef _TRACE
 23+HANDLE outfile = INVALID_HANDLE_VALUE;
 24+void TRACE_ENTER(const char *function, int argtype, void *arg, int end)
 25+{
 26+}
 27+void TRACE_ARG(int argtype, void *arg, int end)
 28+{
 29+}
 30+void TRACE_EXIT(const char *function, int argtype, void *arg)
 31+{
 32+}
 33+#endif
\ No newline at end of file
Index: ddraw/trace.h
@@ -20,10 +20,6 @@
2121 #define _TRACE_H
2222
2323
24 -#ifdef __cplusplus
25 -extern "C" {
26 -#endif
27 -
2824 #ifdef _TRACE
2925 void TRACE_ENTER(const char *function, int argtype, void *arg, int end);
3026 void TRACE_ARG(int argtype, void *arg, int end);
@@ -34,9 +30,4 @@
3531 #define TRACE_EXIT(a,b,c)
3632 #endif
3733
38 -
39 -
40 -#ifdef __cplusplus
41 -}
42 -#endif
4334 #endif //_TRACE_H
\ No newline at end of file