diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2011-12-20 23:30:41 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2011-12-20 23:30:41 +0800 |
| commit | c7eaf4cd114cd864e28f453f6db8b4eb797a5524 (patch) | |
| tree | 264a851df2861509fa3762448338b58c73cc063c | |
| parent | 9c73da59a5f484da422a5c915bd8fae3869ce73b (diff) | |
| download | cogl-c7eaf4cd114cd864e28f453f6db8b4eb797a5524.tar.gz | |
Update Visual C++ property sheets
Re-apply the cogl-defines.h as appropriate if one chooses to change
his/her mind on whether he/she wants to build the SDL winsys.
| -rw-r--r-- | build/win32/vs10/cogl.props | 18 | ||||
| -rw-r--r-- | build/win32/vs9/cogl.vsprops | 18 |
2 files changed, 28 insertions, 8 deletions
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props index a5a0cdee..e0d53afa 100644 --- a/build/win32/vs10/cogl.props +++ b/build/win32/vs10/cogl.props @@ -12,13 +12,23 @@ <TestProgDef>CLUTTER_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<DoDefinesSDL>
-if exist ..\..\..\cogl\cogl-defines.h goto DONE_COGL_DEFINES_H
-copy ..\..\..\cogl\cogl-defines.h.win32_sdl ..\..\..\cogl\cogl-defines.h
+if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H
+if not exist ..\..\..\cogl\WGL_DEFINES goto DO_COGL_DEFINES_H
+del ..\..\..\cogl\cogl-defines.h
+del ..\..\..\cogl\WGL_DEFINES
+:DO_COGL_DEFINES_H
+copy ..\..\..\cogl\cogl-defines.h.win32_sdl ..\..\..\cogl\SDL_DEFINES
+copy ..\..\..\cogl\SDL_DEFINES ..\..\..\cogl\cogl-defines.h
:DONE_COGL_DEFINES_H
</DoDefinesSDL>
<DoDefines>
-if exist ..\..\..\cogl\cogl-defines.h goto DONE_COGL_DEFINES_H
-copy ..\..\..\cogl\cogl-defines.h.win32 ..\..\..\cogl\cogl-defines.h
+if exist ..\..\..\cogl\WGL_DEFINES goto DONE_COGL_DEFINES_H
+if not exist ..\..\..\cogl\SDL_DEFINES goto DO_COGL_DEFINES_H
+del ..\..\..\cogl\cogl-defines.h
+del ..\..\..\cogl\SDL_DEFINES
+:DO_COGL_DEFINES_H
+copy ..\..\..\cogl\cogl-defines.h.win32 ..\..\..\cogl\WGL_DEFINES
+copy ..\..\..\cogl\WGL_DEFINES ..\..\..\cogl\cogl-defines.h
:DONE_COGL_DEFINES_H
</DoDefines>
<PreBuildCmd>
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops index 4ee38bab..30bf9710 100644 --- a/build/win32/vs9/cogl.vsprops +++ b/build/win32/vs9/cogl.vsprops @@ -57,16 +57,26 @@ <UserMacro
Name="DoDefinesSDL"
Value="
-if exist ..\..\..\cogl\cogl-defines.h goto DONE_COGL_DEFINES_H

-copy ..\..\..\cogl\cogl-defines.h.win32_sdl ..\..\..\cogl\cogl-defines.h

+if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H

+if not exist ..\..\..\cogl\WGL_DEFINES goto DO_COGL_DEFINES_H

+del ..\..\..\cogl\cogl-defines.h

+del ..\..\..\cogl\WGL_DEFINES

+:DO_COGL_DEFINES_H

+copy ..\..\..\cogl\cogl-defines.h.win32_sdl ..\..\..\cogl\SDL_DEFINES

+copy ..\..\..\cogl\SDL_DEFINES ..\..\..\cogl\cogl-defines.h

:DONE_COGL_DEFINES_H

"
/>
<UserMacro
Name="DoDefines"
Value="
-if exist ..\..\..\cogl\cogl-defines.h goto DONE_COGL_DEFINES_H

-copy ..\..\..\cogl\cogl-defines.h.win32 ..\..\..\cogl\cogl-defines.h

+if exist ..\..\..\cogl\WGL_DEFINES goto DONE_COGL_DEFINES_H

+if not exist ..\..\..\cogl\SDL_DEFINES goto DO_COGL_DEFINES_H

+del ..\..\..\cogl\cogl-defines.h

+del ..\..\..\cogl\SDL_DEFINES

+:DO_COGL_DEFINES_H

+copy ..\..\..\cogl\cogl-defines.h.win32 ..\..\..\cogl\WGL_DEFINES

+copy ..\..\..\cogl\WGL_DEFINES ..\..\..\cogl\cogl-defines.h

:DONE_COGL_DEFINES_H

"
/>
|