mirror of
https://github.com/vcmi/vcmi.git
synced 2024-11-24 08:32:34 +02:00
?!?
This commit is contained in:
mateuszb
parent
b42a7fa87b
commit
96a7e1600b
@ -41,13 +41,13 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="G:\vcmt\repa\include"
|
||||
AdditionalIncludeDirectories=""E:\C++\Lua_includes";"E:\vcmi\rep - assembla\trunk\lua src";"E:\vcmi\rep - assembla\trunk";"E:\C++\boost_1_36_0";"E:\C++\SDL_mixer-1.2.7\include";"E:\C++\SDL_ttf-2.0.8\include";"E:\C++\zlib 1.2.3 binaries\include";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\include";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\include""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GENIUS_EXPORTS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="4"
|
||||
WarningLevel="1"
|
||||
DebugInformationFormat="4"
|
||||
/>
|
||||
<Tool
|
||||
@ -64,7 +64,7 @@
|
||||
AdditionalDependencies="VCMI_lib.lib"
|
||||
OutputFile="../GeniusAI.dll"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="G:\vcmt\repa\libs"
|
||||
AdditionalLibraryDirectories=""E:\vcmi\rep - assembla\trunk";"E:\C++\lua bin";"E:\C++\boost_1_36_0\lib";"E:\C++\SDL_mixer-1.2.7\lib";"E:\C++\SDL_ttf-2.0.8\lib";"E:\C++\zlib 1.2.3 binaries\lib";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\lib";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\lib""
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
OptimizeReferences="0"
|
||||
@ -120,7 +120,9 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="3"
|
||||
EnableIntrinsicFunctions="true"
|
||||
AdditionalIncludeDirectories=""D:\!GameDevelopment\VCMI\libs\include";G:\vcmt\repa\include"
|
||||
OmitFramePointers="true"
|
||||
EnableFiberSafeOptimizations="true"
|
||||
AdditionalIncludeDirectories=""E:\C++\Lua_includes";"E:\vcmi\rep - assembla\trunk\lua src";"E:\vcmi\rep - assembla\trunk";"E:\C++\boost_1_36_0";"E:\C++\SDL_mixer-1.2.7\include";"E:\C++\SDL_ttf-2.0.8\include";"E:\C++\zlib 1.2.3 binaries\include";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\include";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\include""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GENIUS_EXPORTS"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="true"
|
||||
@ -140,9 +142,9 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="VCMI_lib.lib"
|
||||
OutputFile="../GeniusAI.dll"
|
||||
OutputFile="F:\3DO\Heroes3\AI\GeniusAI.dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="G:\vcmt\repa\libs"
|
||||
AdditionalLibraryDirectories=""E:\vcmi\rep - assembla\trunk";"E:\C++\lua bin";"E:\C++\boost_1_36_0\lib";"E:\C++\SDL_mixer-1.2.7\lib";"E:\C++\SDL_ttf-2.0.8\lib";"E:\C++\zlib 1.2.3 binaries\lib";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\lib";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\lib""
|
||||
GenerateManifest="false"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
||||
@ -1947,6 +1947,7 @@ void CPlayerInterface::heroGotLevel(const CGHeroInstance *hero, int pskill, std:
|
||||
showingDialog->cond.wait(un);
|
||||
}
|
||||
boost::unique_lock<boost::recursive_mutex> un(*pim);
|
||||
LOCPLINT->showingDialog->setn(true);
|
||||
CLevelWindow *lw = new CLevelWindow(hero,pskill,skills,callback);
|
||||
curint->deactivate();
|
||||
lw->activate();
|
||||
@ -2100,7 +2101,6 @@ void CPlayerInterface::actionStarted(const BattleAction* action)
|
||||
battleInt->defendingHero->setPhase(4);
|
||||
else
|
||||
battleInt->attackingHero->setPhase(4);
|
||||
return;
|
||||
}
|
||||
if(!stack)
|
||||
{
|
||||
@ -3582,17 +3582,18 @@ void CLevelWindow::close()
|
||||
}
|
||||
delete this;
|
||||
LOCPLINT->curint->activate();
|
||||
LOCPLINT->showingDialog->setn(false);
|
||||
}
|
||||
CLevelWindow::CLevelWindow(const CGHeroInstance *hero, int pskill, std::vector<ui16> &skills, boost::function<void(ui32)> &callback)
|
||||
{
|
||||
LOCPLINT->showingDialog->setn(true);
|
||||
heroType = hero->subID;
|
||||
cb = callback;
|
||||
for(int i=0;i<skills.size();i++)
|
||||
{
|
||||
comps.push_back(new CSelectableComponent(SComponent::secskill44,skills[i],hero->getSecSkillLevel(skills[i])+1,boost::bind(&CLevelWindow::selectionChanged,this,i)));
|
||||
comps.back()->assignedKeys.insert(SDLK_1 + i);
|
||||
if(comps.size())
|
||||
{
|
||||
comps[0]->assignedKeys.insert(SDLK_1);
|
||||
if(comps.size() > 1)
|
||||
comps[1]->assignedKeys.insert(SDLK_2);
|
||||
}
|
||||
bitmap = BitmapHandler::loadBitmap("LVLUPBKG.bmp");
|
||||
graphics->blueToPlayersAdv(bitmap,hero->tempOwner);
|
||||
@ -3602,6 +3603,7 @@ CLevelWindow::CLevelWindow(const CGHeroInstance *hero, int pskill, std::vector<u
|
||||
pos.w = bitmap->w;
|
||||
pos.h = bitmap->h;
|
||||
ok = new AdventureMapButton("","",boost::bind(&CLevelWindow::close,this),pos.x+297,pos.y+413,"IOKAY.DEF",SDLK_RETURN);
|
||||
ok->block(true);
|
||||
//draw window
|
||||
char buf[100], buf2[100];
|
||||
strcpy(buf2,CGI->generaltexth->allTexts[444].c_str()); //%s has gained a level.
|
||||
@ -3629,16 +3631,6 @@ CLevelWindow::CLevelWindow(const CGHeroInstance *hero, int pskill, std::vector<u
|
||||
curx += ort->w + 18;
|
||||
}
|
||||
}
|
||||
|
||||
if(comps.size() > 1)
|
||||
{
|
||||
ok->block(true);
|
||||
}
|
||||
else if(comps.size() == 1)
|
||||
{
|
||||
comps[0]->select(true);
|
||||
}
|
||||
|
||||
SDL_FreeSurface(ort);
|
||||
|
||||
}
|
||||
|
||||
1620
CPlayerInterface.h
1620
CPlayerInterface.h
File diff suppressed because it is too large
Load Diff
16
README
16
README
@ -1,16 +0,0 @@
|
||||
VCMI Project
|
||||
Copyright (C) 2007-2009 VCMI Team (check AUTHORS file for the contributors list)
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 (included in the license.txt)
|
||||
of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
@ -167,7 +167,7 @@ SDL_Surface * CPCXConv::getSurface()
|
||||
{
|
||||
SDL_Surface * ret;
|
||||
|
||||
int width = -1, height = -1;
|
||||
BMPHeader bh;
|
||||
Epcxformat format;
|
||||
int fSize,y;//,i; //TODO use me 'i'
|
||||
bool check1, check2;
|
||||
@ -175,13 +175,13 @@ SDL_Surface * CPCXConv::getSurface()
|
||||
int it=0;
|
||||
|
||||
fSize = readNormalNr(it,4,pcx);it+=4;
|
||||
width = readNormalNr(it,4,pcx);it+=4;
|
||||
height = readNormalNr(it,4,pcx);it+=4;
|
||||
if (fSize==width*height*3)
|
||||
bh.x = readNormalNr(it,4,pcx);it+=4;
|
||||
bh.y = readNormalNr(it,4,pcx);it+=4;
|
||||
if (fSize==bh.x*bh.y*3)
|
||||
check1=true;
|
||||
else
|
||||
check1=false;
|
||||
if (fSize==width*height)
|
||||
if (fSize==bh.x*bh.y)
|
||||
check2=true;
|
||||
else
|
||||
check2=false;
|
||||
@ -191,12 +191,12 @@ SDL_Surface * CPCXConv::getSurface()
|
||||
format=PCX8B;
|
||||
else
|
||||
return NULL;
|
||||
add = 4 - width%4;
|
||||
add = 4 - bh.x%4;
|
||||
if (add==4)
|
||||
add=0;
|
||||
if (format==PCX8B)
|
||||
{
|
||||
ret = SDL_CreateRGBSurface(SDL_SWSURFACE, width+add, height, 8, 0, 0, 0, 0);
|
||||
ret = SDL_CreateRGBSurface(SDL_SWSURFACE, bh.x+add, bh.y, 8, 0, 0, 0, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -209,7 +209,7 @@ SDL_Surface * CPCXConv::getSurface()
|
||||
int gmask = 0x00ff00;
|
||||
int rmask = 0xff0000;
|
||||
#endif
|
||||
ret = SDL_CreateRGBSurface(SDL_SWSURFACE, width+add, height, 24, rmask, gmask, bmask, 0);
|
||||
ret = SDL_CreateRGBSurface(SDL_SWSURFACE, bh.x+add, bh.y, 24, rmask, gmask, bmask, 0);
|
||||
}
|
||||
if (format==PCX8B)
|
||||
{
|
||||
@ -229,10 +229,10 @@ SDL_Surface * CPCXConv::getSurface()
|
||||
tp.unused = 0;
|
||||
*(ret->format->palette->colors+i) = tp;
|
||||
}
|
||||
for (y=height;y>0;y--)
|
||||
for (y=bh.y;y>0;y--)
|
||||
{
|
||||
it=0xC+(y-1)*width;
|
||||
for (int j=0;j<width;j++)
|
||||
it=0xC+(y-1)*bh.x;
|
||||
for (int j=0;j<bh.x;j++)
|
||||
{
|
||||
*((char*)ret->pixels + ret->pitch * (y-1) + ret->format->BytesPerPixel * j) = pcx[it+j];
|
||||
}
|
||||
@ -240,17 +240,17 @@ SDL_Surface * CPCXConv::getSurface()
|
||||
{
|
||||
for (int j=0;j<add;j++)
|
||||
{
|
||||
*((char*)ret->pixels + ret->pitch * (y-1) + ret->format->BytesPerPixel * (j+width)) = 0;
|
||||
*((char*)ret->pixels + ret->pitch * (y-1) + ret->format->BytesPerPixel * (j+bh.x)) = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (y=height; y>0; y--)
|
||||
for (y=bh.y; y>0; y--)
|
||||
{
|
||||
it=0xC+(y-1)*width*3;
|
||||
for (int j=0;j<width*3;j++)
|
||||
it=0xC+(y-1)*bh.x*3;
|
||||
for (int j=0;j<bh.x*3;j++)
|
||||
{
|
||||
*((char*)ret->pixels + ret->pitch * (y-1) + j) = pcx[it+j];
|
||||
}
|
||||
@ -258,7 +258,7 @@ SDL_Surface * CPCXConv::getSurface()
|
||||
{
|
||||
for (int j=0;j<add*3;j++)
|
||||
{
|
||||
*((char*)ret->pixels + ret->pitch * (y-1) + (j+width*3)) = 0;
|
||||
*((char*)ret->pixels + ret->pitch * (y-1) + (j+bh.x*3)) = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -269,10 +269,7 @@ SDL_Surface * CPCXConv::getSurface()
|
||||
SDL_Surface * BitmapHandler::loadBitmap(std::string fname, bool setKey)
|
||||
{
|
||||
if(!fname.size())
|
||||
{
|
||||
tlog2 << "Call to loadBitmap with void fname!\n";
|
||||
return NULL;
|
||||
}
|
||||
unsigned char * pcx;
|
||||
std::transform(fname.begin(),fname.end(),fname.begin(),toupper);
|
||||
fname.replace(fname.find_first_of('.'),fname.find_first_of('.')+4,".PCX");
|
||||
@ -298,10 +295,7 @@ SDL_Surface * BitmapHandler::loadBitmap(std::string fname, bool setKey)
|
||||
fname.replace(fname.find_first_of('.'),fname.find_first_of('.')+4,".PCX");
|
||||
f = fopen(fname.c_str(),"r");
|
||||
if(!f)
|
||||
{
|
||||
tlog1 << "Cannot open " << fname << " - not present as bmp nor as pcx.\n";
|
||||
return NULL;
|
||||
}
|
||||
fread(sign,1,3,f);
|
||||
if(sign[0]=='B' && sign[1]=='M') //BMP named as PCX - people (eg. Kulex) sometimes use such files
|
||||
{
|
||||
@ -344,7 +338,7 @@ SDL_Surface * BitmapHandler::loadBitmap(std::string fname, bool setKey)
|
||||
int res=bitmaph->infs2(pcd,e->size,e->realSize,pcx);
|
||||
if(res!=0)
|
||||
{
|
||||
tlog2<<"an error "<<res<<" occurred while extracting file "<<fname<<std::endl;
|
||||
tlog2<<"an error "<<res<<" occured while extracting file "<<fname<<std::endl;
|
||||
}
|
||||
delete [] pcd;
|
||||
}
|
||||
|
||||
@ -29,6 +29,7 @@ public:
|
||||
void fromFile(std::string path);
|
||||
void saveBMP(std::string path);
|
||||
void openPCX(char * PCX, int len);
|
||||
void openPCX();
|
||||
void convert();
|
||||
SDL_Surface * getSurface(); //for standard H3 PCX
|
||||
//SDL_Surface * getSurfaceZ(); //for ZSoft PCX
|
||||
|
||||
@ -70,13 +70,13 @@ CSpellWindow::CSpellWindow(const SDL_Rect & myRect, const CGHeroInstance * myHer
|
||||
selectedTab(4),
|
||||
spellSite(0)
|
||||
{
|
||||
mySpells = myHero->spells;
|
||||
//XXX for testing only
|
||||
//for(ui32 v=0; v<CGI->spellh->spells.size(); ++v)
|
||||
//{
|
||||
// if(!CGI->spellh->spells[v].creatureAbility)
|
||||
// mySpells.insert(v);
|
||||
//}
|
||||
//mySpells = myHero->spells;
|
||||
for(ui32 v=0; v<CGI->spellh->spells.size(); ++v)
|
||||
{
|
||||
if(!CGI->spellh->spells[v].creatureAbility)
|
||||
mySpells.insert(v);
|
||||
}
|
||||
|
||||
for(int b=0; b<4; ++b) schoolLvls[b] = 0;
|
||||
for(size_t b=0; b<myHero->secSkills.size(); ++b)
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP2"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="G:\vcmt\repa\include"
|
||||
AdditionalIncludeDirectories=""E:\C++\Lua_includes";"E:\vcmi\rep - assembla\trunk\lua src";"E:\vcmi\rep - assembla\trunk";"E:\C++\boost_1_36_0";"E:\C++\SDL_mixer-1.2.7\include";"E:\C++\SDL_ttf-2.0.8\include";"E:\C++\zlib 1.2.3 binaries\include";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\include";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\include""
|
||||
GeneratePreprocessedFile="0"
|
||||
MinimalRebuild="false"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -63,7 +63,7 @@
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="SDL.lib zdll.lib SDL_image.lib SDL_ttf.lib SDL_mixer.lib lua5.1.lib VCMI_lib.lib"
|
||||
ShowProgress="0"
|
||||
AdditionalLibraryDirectories="G:\vcmt\repa\libs"
|
||||
AdditionalLibraryDirectories=""E:\vcmi\rep - assembla\trunk";"E:\C++\lua bin";"E:\C++\boost_1_36_0\lib";"E:\C++\SDL_mixer-1.2.7\lib";"E:\C++\SDL_ttf-2.0.8\lib";"E:\C++\zlib 1.2.3 binaries\lib";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\lib";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\lib""
|
||||
GenerateDebugInformation="true"
|
||||
OptimizeReferences="1"
|
||||
TargetMachine="1"
|
||||
@ -122,7 +122,7 @@
|
||||
OmitFramePointers="true"
|
||||
EnableFiberSafeOptimizations="true"
|
||||
WholeProgramOptimization="true"
|
||||
AdditionalIncludeDirectories="G:\vcmt\repa\include"
|
||||
AdditionalIncludeDirectories=""E:\C++\Lua_includes";"E:\vcmi\rep - assembla\trunk\lua src";"E:\vcmi\rep - assembla\trunk";"E:\C++\boost_1_36_0";"E:\C++\SDL_mixer-1.2.7\include";"E:\C++\SDL_ttf-2.0.8\include";"E:\C++\zlib 1.2.3 binaries\include";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\include";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\include""
|
||||
StringPooling="true"
|
||||
BasicRuntimeChecks="0"
|
||||
RuntimeLibrary="2"
|
||||
@ -143,12 +143,13 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="SDL.lib zdll.lib SDL_image.lib SDL_ttf.lib SDL_mixer.lib lua5.1.lib VCMI_lib.lib"
|
||||
AdditionalLibraryDirectories="G:\vcmt\repa\libs"
|
||||
OutputFile="F:\3DO\Heroes3\$(ProjectName).exe"
|
||||
AdditionalLibraryDirectories=""E:\vcmi\rep - assembla\trunk";"E:\C++\lua bin";"E:\C++\boost_1_36_0\lib";"E:\C++\SDL_mixer-1.2.7\lib";"E:\C++\SDL_ttf-2.0.8\lib";"E:\C++\zlib 1.2.3 binaries\lib";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\lib";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\lib""
|
||||
GenerateDebugInformation="true"
|
||||
Driver="0"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
LinkTimeCodeGeneration="0"
|
||||
LinkTimeCodeGeneration="1"
|
||||
TargetMachine="1"
|
||||
Profile="true"
|
||||
/>
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP2"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="G:\vcmt\repa\include"
|
||||
AdditionalIncludeDirectories=""E:\C++\Lua_includes";"E:\vcmi\rep - assembla\trunk\lua src";"E:\vcmi\rep - assembla\trunk";"E:\C++\boost_1_36_0";"E:\C++\SDL_mixer-1.2.7\include";"E:\C++\SDL_ttf-2.0.8\include";"E:\C++\zlib 1.2.3 binaries\include";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\include";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\include""
|
||||
MinimalRebuild="false"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -61,7 +61,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="SDL.lib zdll.lib SDL_image.lib SDL_ttf.lib"
|
||||
AdditionalLibraryDirectories="G:\vcmt\repa\libs"
|
||||
AdditionalLibraryDirectories=""E:\C++\lua bin";"E:\C++\boost_1_36_0\lib";"E:\C++\SDL_mixer-1.2.7\lib";"E:\C++\SDL_ttf-2.0.8\lib";"E:\C++\zlib 1.2.3 binaries\lib";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\lib";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\lib""
|
||||
GenerateDebugInformation="true"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
@ -118,7 +118,7 @@
|
||||
OmitFramePointers="true"
|
||||
EnableFiberSafeOptimizations="true"
|
||||
WholeProgramOptimization="true"
|
||||
AdditionalIncludeDirectories="G:\vcmt\repa\include"
|
||||
AdditionalIncludeDirectories=""E:\C++\Lua_includes";"E:\vcmi\rep - assembla\trunk\lua src";"E:\vcmi\rep - assembla\trunk";"E:\C++\boost_1_36_0";"E:\C++\SDL_mixer-1.2.7\include";"E:\C++\SDL_ttf-2.0.8\include";"E:\C++\zlib 1.2.3 binaries\include";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\include";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\include""
|
||||
StringPooling="true"
|
||||
MinimalRebuild="false"
|
||||
BasicRuntimeChecks="0"
|
||||
@ -139,12 +139,13 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="zdll.lib"
|
||||
OutputFile="F:\3DO\Heroes3\$(ProjectName).dll"
|
||||
Version=""
|
||||
AdditionalLibraryDirectories="G:\vcmt\repa\libs"
|
||||
AdditionalLibraryDirectories=""E:\C++\lua bin";"E:\C++\boost_1_36_0\lib";"E:\C++\SDL_mixer-1.2.7\lib";"E:\C++\SDL_ttf-2.0.8\lib";"E:\C++\zlib 1.2.3 binaries\lib";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\lib";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\lib""
|
||||
GenerateDebugInformation="false"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
LinkTimeCodeGeneration="0"
|
||||
LinkTimeCodeGeneration="1"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
|
||||
@ -41,6 +41,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP2"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""E:\C++\Lua_includes";"E:\vcmi\rep - assembla\trunk\lua src";"E:\vcmi\rep - assembla\trunk";"E:\C++\boost_1_36_0";"E:\C++\SDL_mixer-1.2.7\include";"E:\C++\SDL_ttf-2.0.8\include";"E:\C++\zlib 1.2.3 binaries\include";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\include";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\include""
|
||||
MinimalRebuild="false"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -60,7 +61,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="VCMI_lib.lib zdll.lib"
|
||||
AdditionalLibraryDirectories="G:\vcmt\repa\libs"
|
||||
AdditionalLibraryDirectories=""E:\vcmi\rep - assembla\trunk";"E:\C++\lua bin";"E:\C++\boost_1_36_0\lib";"E:\C++\SDL_mixer-1.2.7\lib";"E:\C++\SDL_ttf-2.0.8\lib";"E:\C++\zlib 1.2.3 binaries\lib";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\lib";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\lib""
|
||||
GenerateDebugInformation="true"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
@ -116,6 +117,7 @@
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
EnableFiberSafeOptimizations="true"
|
||||
AdditionalIncludeDirectories=""E:\C++\Lua_includes";"E:\vcmi\rep - assembla\trunk\lua src";"E:\vcmi\rep - assembla\trunk";"E:\C++\boost_1_36_0";"E:\C++\SDL_mixer-1.2.7\include";"E:\C++\SDL_ttf-2.0.8\include";"E:\C++\zlib 1.2.3 binaries\include";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\include";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\include""
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="false"
|
||||
@ -135,7 +137,8 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="VCMI_lib.lib zdll.lib"
|
||||
AdditionalLibraryDirectories="G:\vcmt\repa\libs"
|
||||
OutputFile="F:\3DO\Heroes3\$(ProjectName).exe"
|
||||
AdditionalLibraryDirectories=""E:\vcmi\rep - assembla\trunk";"E:\C++\lua bin";"E:\C++\boost_1_36_0\lib";"E:\C++\SDL_mixer-1.2.7\lib";"E:\C++\SDL_ttf-2.0.8\lib";"E:\C++\zlib 1.2.3 binaries\lib";"E:\C++\SDL-1.2.11\devlibs - visual\SDL-1.2.11\lib";"E:\C++\SDL_Image 1.2.5\SDL_image-1.2.5\lib""
|
||||
GenerateDebugInformation="false"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user