I just download the latest svn1029 using tortoiseSvn and when i open the vs2010 project in the
"branches\Pre-Wx" i get this message just for opening the sln:
Quote:C:\VSProjects\VBA-M\vbam\branches\dependencies\zlib\zlib.vcxproj : error : Project "C:\VSProjects\VBA-M\vbam\branches\dependencies\zlib\zlib.vcxproj" could not be found.
C:\VSProjects\VBA-M\vbam\branches\dependencies\SFML\build\vc2010\sfml-network.vcxproj : error : Project "C:\VSProjects\VBA-M\vbam\branches\dependencies\SFML\build\vc2010\sfml-network.vcxproj" could not be found.
C:\VSProjects\VBA-M\vbam\branches\dependencies\lpng140\projects\visualc10\libpng.vcxproj : error : Project "C:\VSProjects\VBA-M\vbam\branches\dependencies\lpng140\projects\visualc10\libpng.vcxproj" could not be found.
C:\VSProjects\VBA-M\vbam\branches\dependencies\fex\File_Extractor2010.vcxproj : error : Project "C:\VSProjects\VBA-M\vbam\branches\dependencies\fex\File_Extractor2010.vcxproj" could not be found.
It need to be re-referenced before it can be build.
Next i tested the project in the
"trunk", loading the sln seems to be ok, but when i tried to build it, i'm getting 85 Errors O_o this is the 1st and 2nd errors:
Quote:Error 17 error C2039: 'Thread' : is not a member of 'sf' c:\vsprojects\vba-m\vbam\trunk\src\gba\gbalink.h 137 1 VisualBoyAdvance-M
Error 18 error C2143: syntax error : missing ';' before '*' c:\vsprojects\vba-m\vbam\trunk\src\gba\gbalink.h 137 1 VisualBoyAdvance-M
These are the results of the original files freshly downloaded from svn.
BTW, i have a question regarding working with SVN,
for example i'm working on GBALink.cpp and at the same time someone else working on the same file and update the SVN. What will happened to my local GBALink.cpp when i update the svn?
Will my works disappeared (overwritten by the new GBALink.cpp from SVN) or will both GBALink.cpp merged (not sure whether the resulting GBALink.cpp will works tho)?
It would be better if it will only give warning instead of overwriting my code automatically, so i can compare both GBALink.cpp and merge them manually.