X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ce0ccf59331fa1b0301195544046819972ef819..e0effd7e3b8ad53abdcd008da75ba49a4af1ebf2:/build/msw/wx_vc10_gl.vcxproj?ds=inline
diff --git a/build/msw/wx_vc10_gl.vcxproj b/build/msw/wx_vc10_gl.vcxproj
index b07e35b5c0..67480cabee 100644
--- a/build/msw/wx_vc10_gl.vcxproj
+++ b/build/msw/wx_vc10_gl.vcxproj
@@ -74,18 +74,19 @@
false
true
wxmsw29ud_gl
- wxmsw295ud_$(ProjectName)_vc_custom
- wxmsw295u_$(ProjectName)_vc_custom
+ wxmsw29u_gl
+ wxmsw295ud_$(ProjectName)_vc_custom
+ wxmsw295u_$(ProjectName)_vc_custom
WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions)
- ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
+ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
/MP %(AdditionalOptions)
Disabled
- ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
+ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions)
Sync
EnableFastChecks
@@ -96,7 +97,7 @@
wx/wxprec.h
vc_mswud\wxprec_gllib.pch
vc_mswud\gl\
- ..\..\lib\vc_lib\wxmsw29ud_gl.pdb
+ $(OutDir)wxmsw29ud_gl.pdb
Level4
true
ProgramDatabase
@@ -104,26 +105,26 @@
_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions)
0x0409
- ..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
+ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
- ..\..\lib\vc_lib\wxmsw29ud_gl.lib
+ $(OutDir)wxmsw29ud_gl.lib
true
- ..\..\lib\vc_lib\wx_vc9_gl.bsc
+ $(OutDir)wx_vc9_gl.bsc
true
WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions)
- ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
+ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
/MP %(AdditionalOptions)
MaxSpeed
- ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
+ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions)
Sync
MultiThreadedDLL
@@ -132,7 +133,7 @@
wx/wxprec.h
vc_mswu\wxprec_gllib.pch
vc_mswu\gl\
- ..\..\lib\vc_lib\wxmsw29u_gl.pdb
+ $(OutDir)wxmsw29u_gl.pdb
Level4
true
ProgramDatabase
@@ -140,26 +141,26 @@
_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions)
0x0409
- ..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
+ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
- ..\..\lib\vc_lib\wxmsw29u_gl.lib
+ $(OutDir)wxmsw29u_gl.lib
true
- ..\..\lib\vc_lib\wx_vc9_gl.bsc
+ $(OutDir)wx_vc9_gl.bsc
true
WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions)
- ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
+ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
/MP %(AdditionalOptions)
Disabled
- ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
+ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions)
Sync
EnableFastChecks
@@ -170,7 +171,7 @@
wx/wxprec.h
vc_mswuddll\wxprec_gldll.pch
vc_mswuddll\gl\
- ..\..\lib\vc_dll\wxmsw295ud_gl_vc_custom.pdb
+ $(OutDir)wxmsw295ud_gl_vc_custom.pdb
Level4
true
ProgramDatabase
@@ -178,33 +179,33 @@
_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions)
0x0409
- ..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
+ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
%(AdditionalOptions)
wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;wxmsw29ud_core.lib;wxbase29ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)
- ..\..\lib\vc_dll\wxmsw295ud_gl_vc_custom.dll
- ..\..\lib\vc_dll\wxmsw29ud_gl.lib
+ $(OutDir)wxmsw295ud_gl_vc_custom.dll
+ $(OutDir)wxmsw29ud_gl.lib
true
- ..\..\lib\vc_dll;%(AdditionalLibraryDirectories)
+ $(OutDir);%(AdditionalLibraryDirectories)
true
- ..\..\lib\vc_dll\wxmsw295ud_gl_vc_custom.pdb
+ $(OutDir)wxmsw295ud_gl_vc_custom.pdb
MachineX86
- ..\..\lib\vc_dll\wx_vc9_gl.bsc
+ $(OutDir)wx_vc9_gl.bsc
true
WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions)
- ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
+ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
/MP %(AdditionalOptions)
MaxSpeed
- ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
+ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions)
Sync
MultiThreadedDLL
@@ -213,7 +214,7 @@
wx/wxprec.h
vc_mswudll\wxprec_gldll.pch
vc_mswudll\gl\
- ..\..\lib\vc_dll\wxmsw295u_gl_vc_custom.pdb
+ $(OutDir)wxmsw295u_gl_vc_custom.pdb
Level4
true
ProgramDatabase
@@ -221,23 +222,23 @@
_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions)
0x0409
- ..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
+ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)
%(AdditionalOptions)
wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;wxmsw29u_core.lib;wxbase29u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)
- ..\..\lib\vc_dll\wxmsw295u_gl_vc_custom.dll
- ..\..\lib\vc_dll\wxmsw29u_gl.lib
+ $(OutDir)wxmsw295u_gl_vc_custom.dll
+ $(OutDir)wxmsw29u_gl.lib
true
- ..\..\lib\vc_dll;%(AdditionalLibraryDirectories)
+ $(OutDir);%(AdditionalLibraryDirectories)
true
- ..\..\lib\vc_dll\wxmsw295u_gl_vc_custom.pdb
+ $(OutDir)wxmsw295u_gl_vc_custom.pdb
MachineX86
true
true
- ..\..\lib\vc_dll\wx_vc9_gl.bsc
+ $(OutDir)wx_vc9_gl.bsc
true
@@ -259,36 +260,36 @@
- Creating ..\..\lib\vc_dll\mswud\wx\setup.h
- copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
- ..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs)
- Creating ..\..\lib\vc_dll\mswu\wx\setup.h
- copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
- ..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs)
- Creating ..\..\lib\vc_lib\mswud\wx\setup.h
- copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
- ..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs)
- Creating ..\..\lib\vc_lib\mswu\wx\setup.h
- copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
- ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs)
+ Creating $(OutDir)mswud\wx\setup.h
+ copy "%(FullPath)" $(OutDir)mswud\wx\setup.h
+ $(OutDir)mswud\wx\setup.h;%(Outputs)
+ Creating $(OutDir)mswu\wx\setup.h
+ copy "%(FullPath)" $(OutDir)mswu\wx\setup.h
+ $(OutDir)mswu\wx\setup.h;%(Outputs)
+ Creating $(OutDir)mswud\wx\setup.h
+ copy "%(FullPath)" $(OutDir)mswud\wx\setup.h
+ $(OutDir)mswud\wx\setup.h;%(Outputs)
+ Creating $(OutDir)mswu\wx\setup.h
+ copy "%(FullPath)" $(OutDir)mswu\wx\setup.h
+ $(OutDir)mswu\wx\setup.h;%(Outputs)
- Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
- cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
- ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs)
- ..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs)
- Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
- cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
- ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs)
- ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs)
- Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
- cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
- ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)
- ..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs)
- Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
- cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
- ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)
- ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs)
+ Creating $(OutDir)mswud\wx\msw\rcdefs.h
+ cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h"
+ $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs)
+ $(OutDir)mswud\wx\msw;%(AdditionalInputs)
+ Creating $(OutDir)mswu\wx\msw\rcdefs.h
+ cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h"
+ $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs)
+ $(OutDir)mswu\wx\msw;%(AdditionalInputs)
+ Creating $(OutDir)mswud\wx\msw\rcdefs.h
+ cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h"
+ $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs)
+ $(OutDir)mswud\wx\msw;%(AdditionalInputs)
+ Creating $(OutDir)mswu\wx\msw\rcdefs.h
+ cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h"
+ $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs)
+ $(OutDir)mswu\wx\msw;%(AdditionalInputs)