diff --git a/wxPG/propgrid/build/propgrid_propgrid_vc10.vcxproj b/wxPG/propgrid/build/propgrid_propgrid_vc10.vcxproj index ffcc317ea..e9438dd74 100644 --- a/wxPG/propgrid/build/propgrid_propgrid_vc10.vcxproj +++ b/wxPG/propgrid/build/propgrid_propgrid_vc10.vcxproj @@ -640,7 +640,7 @@ Disabled - \u\guy\wx28X\lib\vc_dll\mswd;\u\guy\wx28X\include;..\include;%(AdditionalIncludeDirectories) + ..\..\..\wx28X\lib\vc_dll\mswd;..\..\..\wx28X\include;../include;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;_DEBUG;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) true Sync diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/CL.read.1.tlog b/wxPG/propgrid/build/vcmswd_dll/propgrid/CL.read.1.tlog index f97080624..177b849e6 100644 Binary files a/wxPG/propgrid/build/vcmswd_dll/propgrid/CL.read.1.tlog and b/wxPG/propgrid/build/vcmswd_dll/propgrid/CL.read.1.tlog differ diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/CL.write.1.tlog b/wxPG/propgrid/build/vcmswd_dll/propgrid/CL.write.1.tlog index b3909aad9..dd87d9873 100644 Binary files a/wxPG/propgrid/build/vcmswd_dll/propgrid/CL.write.1.tlog and b/wxPG/propgrid/build/vcmswd_dll/propgrid/CL.write.1.tlog differ diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/advprops.obj b/wxPG/propgrid/build/vcmswd_dll/propgrid/advprops.obj index 4541bbd3d..943854e57 100644 Binary files a/wxPG/propgrid/build/vcmswd_dll/propgrid/advprops.obj and b/wxPG/propgrid/build/vcmswd_dll/propgrid/advprops.obj differ diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/cl.command.1.tlog b/wxPG/propgrid/build/vcmswd_dll/propgrid/cl.command.1.tlog index c26b7da10..d2d7e96f7 100644 Binary files a/wxPG/propgrid/build/vcmswd_dll/propgrid/cl.command.1.tlog and b/wxPG/propgrid/build/vcmswd_dll/propgrid/cl.command.1.tlog differ diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/editors.obj b/wxPG/propgrid/build/vcmswd_dll/propgrid/editors.obj index b8a102307..8e5ca03b9 100644 Binary files a/wxPG/propgrid/build/vcmswd_dll/propgrid/editors.obj and b/wxPG/propgrid/build/vcmswd_dll/propgrid/editors.obj differ diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/extras.obj b/wxPG/propgrid/build/vcmswd_dll/propgrid/extras.obj index 5ef5414b3..ffbf1d7d2 100644 Binary files a/wxPG/propgrid/build/vcmswd_dll/propgrid/extras.obj and b/wxPG/propgrid/build/vcmswd_dll/propgrid/extras.obj differ diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/manager.obj b/wxPG/propgrid/build/vcmswd_dll/propgrid/manager.obj index 8011bfa11..b4c32d347 100644 Binary files a/wxPG/propgrid/build/vcmswd_dll/propgrid/manager.obj and b/wxPG/propgrid/build/vcmswd_dll/propgrid/manager.obj differ diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/odcombo.obj b/wxPG/propgrid/build/vcmswd_dll/propgrid/odcombo.obj index 4b78cbf32..7bf76a15f 100644 Binary files a/wxPG/propgrid/build/vcmswd_dll/propgrid/odcombo.obj and b/wxPG/propgrid/build/vcmswd_dll/propgrid/odcombo.obj differ diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/propgrid.lastbuildstate b/wxPG/propgrid/build/vcmswd_dll/propgrid/propgrid.lastbuildstate index 58a93463b..d3814fc83 100644 --- a/wxPG/propgrid/build/vcmswd_dll/propgrid/propgrid.lastbuildstate +++ b/wxPG/propgrid/build/vcmswd_dll/propgrid/propgrid.lastbuildstate @@ -1,2 +1,2 @@ #v4.0:v100 -DLL ANSI Debug Multilib|Win32|C:\U\guy\wxPG\propgrid\build\| +DLL ANSI Debug Monolithic|Win32|C:\u\R_12_00\wxPG\propgrid\build\| diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/propgrid.obj b/wxPG/propgrid/build/vcmswd_dll/propgrid/propgrid.obj index c5a05be1e..319f3cc2c 100644 Binary files a/wxPG/propgrid/build/vcmswd_dll/propgrid/propgrid.obj and b/wxPG/propgrid/build/vcmswd_dll/propgrid/propgrid.obj differ diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/propgrid_propgrid_vc10.log b/wxPG/propgrid/build/vcmswd_dll/propgrid/propgrid_propgrid_vc10.log index a64d9bc3f..a9e82160d 100644 --- a/wxPG/propgrid/build/vcmswd_dll/propgrid/propgrid_propgrid_vc10.log +++ b/wxPG/propgrid/build/vcmswd_dll/propgrid/propgrid_propgrid_vc10.log @@ -1,53 +1,12 @@ -Build started 23/12/2010 10:56:35. - 1>Project "C:\U\guy\wxPG\propgrid\build\propgrid_propgrid_vc10.vcxproj" on node 2 (rebuild target(s)). - 1>_PrepareForClean: - Deleting file "vcmswd_dll\propgrid\propgrid.lastbuildstate". - InitializeBuildStatus: - Creating "vcmswd_dll\propgrid\propgrid.unsuccessfulbuild" because "AlwaysCreate" was specified. - ClCompile: - C:\Program Files\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /I..\..\..\wx28X\lib\vc_dll\mswd /I..\..\..\wx28X\include /I..\include /Zi /nologo /W4 /WX- /Od /Oy- /D WIN32 /D _USRDLL /D DLL_EXPORTS /D WXUSINGDLL /D __WXDEBUG__ /D __WXMSW__ /D _DEBUG /D WXMAKINGDLL_PROPGRID /D _WINDLL /Gm /EHsc /RTC1 /MTd /GS /fp:precise /Zc:wchar_t /Zc:forScope /GR /Fo"vcmswd_dll\propgrid\\" /Fd"..\lib\vc_dll\wxcode_msw28d_propgrid.pdb" /Gd /TP /analyze- /errorReport:prompt ..\src\advprops.cpp ..\src\editors.cpp ..\src\extras.cpp ..\src\manager.cpp ..\src\odcombo.cpp ..\src\propgrid.cpp ..\src\props.cpp - props.cpp - propgrid.cpp - odcombo.cpp - manager.cpp - extras.cpp - editors.cpp - advprops.cpp - Generating Code... - ManifestResourceCompile: - C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\rc.exe /nologo /fo"vcmswd_dll\propgrid\propgrid.dll.embed.manifest.res" vcmswd_dll\propgrid\propgrid_manifest.rc - 1>C:\Program Files\MSBuild\Microsoft.Cpp\v4.0\Microsoft.CppBuild.targets(990,5): warning MSB8012: TargetPath(C:\U\guy\wxPG\propgrid\build\..\lib\vc_dll\propgrid.dll) does not match the Linker's OutputFile property value (C:\U\guy\wxPG\propgrid\lib\vc_dll\wxcode_msw28d_propgrid.dll). This may cause your project to build incorrectly. To correct this, please make sure that $(OutDir), $(TargetName) and $(TargetExt) property values match the value specified in %(Link.OutputFile). - 1>C:\Program Files\MSBuild\Microsoft.Cpp\v4.0\Microsoft.CppBuild.targets(992,5): warning MSB8012: TargetName(propgrid) does not match the Linker's OutputFile property value (wxcode_msw28d_propgrid). This may cause your project to build incorrectly. To correct this, please make sure that $(OutDir), $(TargetName) and $(TargetExt) property values match the value specified in %(Link.OutputFile). - Link: - C:\Program Files\Microsoft Visual Studio 10.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"..\lib\vc_dll\wxcode_msw28d_propgrid.dll" /INCREMENTAL /NOLOGO /LIBPATH:..\..\..\wx28X\lib\vc_dll /LIBPATH:..\lib\vc_dll wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.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 odbc32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /ManifestFile:"vcmswd_dll\propgrid\propgrid.dll.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /DEBUG /PDB:"..\lib\vc_dll\wxcode_msw28d_propgrid.pdb" /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"..\lib\vc_dll\wxcode_msw28d_propgrid.lib" /MACHINE:X86 /DLL vcmswd_dll\propgrid\propgrid.dll.embed.manifest.res - vcmswd_dll\propgrid\advprops.obj - vcmswd_dll\propgrid\editors.obj - vcmswd_dll\propgrid\extras.obj - vcmswd_dll\propgrid\manager.obj - vcmswd_dll\propgrid\odcombo.obj - vcmswd_dll\propgrid\propgrid.obj - vcmswd_dll\propgrid\props.obj - Creating library ..\lib\vc_dll\wxcode_msw28d_propgrid.lib and object ..\lib\vc_dll\wxcode_msw28d_propgrid.exp - Manifest: - Deleting file "vcmswd_dll\propgrid\propgrid.dll.embed.manifest". - C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\mt.exe /nologo /verbose /out:"vcmswd_dll\propgrid\propgrid.dll.embed.manifest" /manifest vcmswd_dll\propgrid\propgrid.dll.intermediate.manifest - C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\rc.exe /nologo /fo"vcmswd_dll\propgrid\propgrid.dll.embed.manifest.res" vcmswd_dll\propgrid\propgrid_manifest.rc - LinkEmbedManifest: - C:\Program Files\Microsoft Visual Studio 10.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"..\lib\vc_dll\wxcode_msw28d_propgrid.dll" /INCREMENTAL /NOLOGO /LIBPATH:..\..\..\wx28X\lib\vc_dll /LIBPATH:..\lib\vc_dll wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.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 odbc32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /ManifestFile:"vcmswd_dll\propgrid\propgrid.dll.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /DEBUG /PDB:"..\lib\vc_dll\wxcode_msw28d_propgrid.pdb" /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"..\lib\vc_dll\wxcode_msw28d_propgrid.lib" /MACHINE:X86 /DLL vcmswd_dll\propgrid\propgrid.dll.embed.manifest.res - vcmswd_dll\propgrid\advprops.obj - vcmswd_dll\propgrid\editors.obj - vcmswd_dll\propgrid\extras.obj - vcmswd_dll\propgrid\manager.obj - vcmswd_dll\propgrid\odcombo.obj - vcmswd_dll\propgrid\propgrid.obj - vcmswd_dll\propgrid\props.obj - Creating library ..\lib\vc_dll\wxcode_msw28d_propgrid.lib and object ..\lib\vc_dll\wxcode_msw28d_propgrid.exp - propgrid_propgrid_vc10.vcxproj -> C:\U\guy\wxPG\propgrid\build\..\lib\vc_dll\propgrid.dll - FinalizeBuildStatus: - Deleting file "vcmswd_dll\propgrid\propgrid.unsuccessfulbuild". - Touching "vcmswd_dll\propgrid\propgrid.lastbuildstate". - 1>Done Building Project "C:\U\guy\wxPG\propgrid\build\propgrid_propgrid_vc10.vcxproj" (rebuild target(s)). - -Build succeeded. - -Time Elapsed 00:00:35.17 + props.cpp + propgrid.cpp + odcombo.cpp + manager.cpp + extras.cpp + editors.cpp + advprops.cpp + Generazione del codice in corso... +C:\Programmi\MSBuild\Microsoft.Cpp\v4.0\Microsoft.CppBuild.targets(990,5): warning MSB8012: TargetPath(C:\u\R_12_00\wxPG\propgrid\build\..\lib\vc_dll\propgrid.dll) non corrisponde al valore della proprietà OutputFile di Linker (C:\u\R_12_00\wxPG\propgrid\lib\vc_dll\wxcode_msw28d_propgrid.dll). Questa condizione potrebbe impedire la corretta compilazione del progetto. Per risolvere il problema, accertarsi che i valori di proprietà $(OutDir), $(TargetName) e $(TargetExt) corrispondano al valore specificato in %(Link.OutputFile). +C:\Programmi\MSBuild\Microsoft.Cpp\v4.0\Microsoft.CppBuild.targets(992,5): warning MSB8012: TargetName(propgrid) non corrisponde al valore della proprietà OutputFile di Linker (wxcode_msw28d_propgrid). Questa condizione potrebbe impedire la corretta compilazione del progetto. Per risolvere il problema, accertarsi che i valori di proprietà $(OutDir), $(TargetName) e $(TargetExt) corrispondano al valore specificato in %(Link.OutputFile). + LINK : ..\lib\vc_dll\wxcode_msw28d_propgrid.dll non trovato o non compilato dall'ultimo collegamento incrementale; verrà eseguito il collegamento completo +LINK : fatal error LNK1104: impossibile aprire il file 'wxmsw28d.lib' diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/props.obj b/wxPG/propgrid/build/vcmswd_dll/propgrid/props.obj index 5d08f4196..7891fac81 100644 Binary files a/wxPG/propgrid/build/vcmswd_dll/propgrid/props.obj and b/wxPG/propgrid/build/vcmswd_dll/propgrid/props.obj differ diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/rc.command.1.tlog b/wxPG/propgrid/build/vcmswd_dll/propgrid/rc.command.1.tlog index f5e1d7a64..dfe41c705 100644 Binary files a/wxPG/propgrid/build/vcmswd_dll/propgrid/rc.command.1.tlog and b/wxPG/propgrid/build/vcmswd_dll/propgrid/rc.command.1.tlog differ diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/rc.read.1.tlog b/wxPG/propgrid/build/vcmswd_dll/propgrid/rc.read.1.tlog index 1c9b611bb..eeb4ec49c 100644 Binary files a/wxPG/propgrid/build/vcmswd_dll/propgrid/rc.read.1.tlog and b/wxPG/propgrid/build/vcmswd_dll/propgrid/rc.read.1.tlog differ diff --git a/wxPG/propgrid/build/vcmswd_dll/propgrid/rc.write.1.tlog b/wxPG/propgrid/build/vcmswd_dll/propgrid/rc.write.1.tlog index fd5f9e540..3f565aa0b 100644 Binary files a/wxPG/propgrid/build/vcmswd_dll/propgrid/rc.write.1.tlog and b/wxPG/propgrid/build/vcmswd_dll/propgrid/rc.write.1.tlog differ diff --git a/wxPG/propgrid/lib/vc_dll/wxcode_msw28d_propgrid.idb b/wxPG/propgrid/lib/vc_dll/wxcode_msw28d_propgrid.idb index de8517d76..ee99ccb1e 100644 Binary files a/wxPG/propgrid/lib/vc_dll/wxcode_msw28d_propgrid.idb and b/wxPG/propgrid/lib/vc_dll/wxcode_msw28d_propgrid.idb differ diff --git a/wxPG/propgrid/lib/vc_dll/wxcode_msw28d_propgrid.pdb b/wxPG/propgrid/lib/vc_dll/wxcode_msw28d_propgrid.pdb index 641d85674..6f76fb8cf 100644 Binary files a/wxPG/propgrid/lib/vc_dll/wxcode_msw28d_propgrid.pdb and b/wxPG/propgrid/lib/vc_dll/wxcode_msw28d_propgrid.pdb differ