* Some stuff with changing the Dink HD menu key to F1 from Shift-Escape
* Added Dan's .png loading patch (untested) git-svn-id: svn://rtsoft.com/rtsvn/projects/RTDink@1522 353e56fe-9613-0410-8469-b96ad8e6f29c
This commit is contained in:
seth
parent
20f8a6a856
commit
e0b2d2e5f0
17 changed files with 353 additions and 36 deletions
|
|
@ -31,6 +31,9 @@ if not exist %C_TARGET_EXE% beeper.exe /p
|
|||
|
||||
:Sign it with the RTsoft cert (optional)
|
||||
|
||||
echo "Waiting 5 seconds "
|
||||
timeout 5
|
||||
|
||||
call sign.bat %C_TARGET_EXE%
|
||||
|
||||
REM Do a little cleanup in the dink bin dir as well
|
||||
|
|
@ -65,6 +68,9 @@ cd win_installer
|
|||
cd ..
|
||||
set d_fname=%C_FILENAME%
|
||||
|
||||
echo "Waiting 5 seconds because NSIS does something and ruins the signing if I don't"
|
||||
timeout 5
|
||||
|
||||
call sign.bat %C_FILENAME%
|
||||
|
||||
:call FTPToSiteWin.bat
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
cd ..\android
|
||||
call build.bat
|
||||
call ..\app_info_setup.bat
|
||||
:call buildRelease.bat
|
||||
@ECHO ON
|
||||
set D_FILE_NAME=%APP_NAME%-unprotected.apk
|
||||
del ..\%D_FILE_NAME%
|
||||
copy bin\%APP_NAME%-debug.apk ..\%D_FILE_NAME%
|
||||
cd ..
|
||||
cd bin
|
||||
set D_FILE_NAME=%APP_NAME%-release.apk
|
||||
copy %D_FILE_NAME% ..\..\script
|
||||
cd ..\..\script
|
||||
set d_fname=%D_FILE_NAME%
|
||||
call script\FTPToSite.bat
|
||||
cd script
|
||||
call FTPToSiteWin.bat
|
||||
|
||||
pause
|
||||
34
script/FTPToSiteWin.bat
Normal file
34
script/FTPToSiteWin.bat
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
|
||||
REM This will FTP the latest build into the correct dir at RTSOFT
|
||||
|
||||
if "%d_fname%" == "" (
|
||||
echo d_fname not set.
|
||||
beeper.exe /p
|
||||
exit
|
||||
)
|
||||
|
||||
REM get our ftp logon info
|
||||
call ../../../SetFTPLogonInfo.bat
|
||||
|
||||
REM create script for the FTP process
|
||||
|
||||
if exist ftp.tmp del ftp.tmp
|
||||
|
||||
echo user %_FTP_USER_% %_FTP_PASS_% >> ftp.tmp
|
||||
echo cd www >> ftp.tmp
|
||||
echo cd dink >> ftp.tmp
|
||||
echo binary >> ftp.tmp
|
||||
echo put %d_fname% >> ftp.tmp
|
||||
echo quit >> ftp.tmp
|
||||
|
||||
|
||||
echo http://www.rtsoft.com/dink/%d_fname%
|
||||
|
||||
ftp -n -i -d -s:ftp.tmp %_FTP_SITE_%
|
||||
|
||||
del ftp.tmp
|
||||
|
||||
REM remove environmental vars we used
|
||||
set C_FILENAME=
|
||||
call ../../../KillFTPLogonInfo.bat
|
||||
|
||||
6
script/UploadWindowsVersionAsBeta.bat
Normal file
6
script/UploadWindowsVersionAsBeta.bat
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
SET C_FILENAME=DinkSmallwoodHDInstallerBeta.exe
|
||||
del %C_FILENAME%
|
||||
copy DinkSmallwoodHDInstaller.exe %C_FILENAME%
|
||||
set d_fname=%C_FILENAME%
|
||||
call FTPToSiteWin.bat
|
||||
pause
|
||||
|
|
@ -9,7 +9,7 @@ NOTE: Quick saves might give a "Can't load old version" error if the data format
|
|||
|
||||
Controls:
|
||||
|
||||
F1 - Quick save
|
||||
F4 - Quick save
|
||||
F10 - Quick load
|
||||
Control - Attack
|
||||
Arrow keys - Movement
|
||||
|
|
@ -17,7 +17,7 @@ Space - Talk
|
|||
Enter - Inventory
|
||||
Shift - Magic
|
||||
Escape - Bring up classic dink escape menu
|
||||
Shift-Escape - Bring up Dink HD escape menu
|
||||
F1 - Bring up Dink HD escape menu
|
||||
Drag on window borders - scale the play area (when windowed)
|
||||
|
||||
NOTE: If you have a controller (like an xbox 360 pad) plugged in when you start the game, you can use that instead of keyboard, but you still need to use the
|
||||
|
|
@ -282,3 +282,7 @@ use timing (Myster island camera sequence for example) easier though, not sure.
|
|||
* Now gives a clear warning in the log.txt if a seq tries to go beyond what it can handle and will truncate it (better than breaking the whole sequence as it did before)
|
||||
* Added support for a weird bmp header type, fixes incorrect palette issue in the dmod The Orb of Darkness
|
||||
* Fixed life/exp/health to correctly interpolate between values like the original dink, huge thanks to Dan's detailed bug report on this, he even made a mod which made testing the fix a breeze!
|
||||
* BUGFIX: .dmod files detected in the main Dink HD dir are now properly deleted after auto-installing them
|
||||
* (Windows) Key binding changes: F1 now brings up the Dink Menu (Shift-Escape was .. weird..) and quicksave was moved to F4
|
||||
|
||||
- Note: Save state version has changed, old save states won't load!
|
||||
|
|
|
|||
|
|
@ -762,8 +762,9 @@ void App::Update()
|
|||
AddKeyBinding(pComp, "Magic", VIRTUAL_KEY_SHIFT, VIRTUAL_KEY_GAME_MAGIC);
|
||||
AddKeyBinding(pComp, "Fire", VIRTUAL_KEY_CONTROL, VIRTUAL_KEY_GAME_FIRE);
|
||||
AddKeyBinding(pComp, "Speedup", 9, 9); //handle tab
|
||||
AddKeyBinding(pComp, "Quicksave", VIRTUAL_KEY_F1, VIRTUAL_KEY_F1);
|
||||
AddKeyBinding(pComp, "Quicksave", VIRTUAL_KEY_F4, VIRTUAL_KEY_F4);
|
||||
AddKeyBinding(pComp, "Quickload", VIRTUAL_KEY_F8, VIRTUAL_KEY_F8);
|
||||
AddKeyBinding(pComp, "DinkHDMenu", VIRTUAL_KEY_F1, VIRTUAL_KEY_F1);
|
||||
}
|
||||
|
||||
if (GetVar("check_icade")->GetUINT32() == 0)
|
||||
|
|
|
|||
|
|
@ -212,8 +212,9 @@ if (IsDesktop())
|
|||
"Enter ``- `8Inventory screen/Inventory select\n``"\
|
||||
"M ``- `8Show map\n\n``"\
|
||||
"TAB ``- `8Speed up game (hold it down)\n``"\
|
||||
"F1 ``- `8Quick state save\n``"\
|
||||
"F4 ``- `8Quick state save\n``"\
|
||||
"F8 ``- `8Quick state load\n``"\
|
||||
"F1 ``- `8Dink HD Menu\n``"\
|
||||
"Alt-Enter ``- `8Toggle fullscreen\n``"\
|
||||
"Drag window corners ``- `8Changes screensize. Hold Shift to allow any aspect ratio\n``"\
|
||||
"\n`6Stuck? Try visiting `wdinknetwork.com`` or use google to find a walkthrough.\n"\
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@ void GameOnSelect(VariantList *pVList) //0=vec2 point of click, 1=entity sent fr
|
|||
{
|
||||
|
||||
#ifdef WINAPI
|
||||
/*
|
||||
if (GetKeyState(VK_SHIFT) & 0xfe)
|
||||
{
|
||||
if (!pMenu->GetEntityByName("PauseMenu"))
|
||||
|
|
@ -98,12 +99,13 @@ void GameOnSelect(VariantList *pVList) //0=vec2 point of click, 1=entity sent fr
|
|||
}
|
||||
return;
|
||||
}
|
||||
*/
|
||||
#endif
|
||||
|
||||
g_dglo.m_dirInput[DINK_INPUT_BUTTON5] = true;
|
||||
g_dglo.m_dirInputFinished[DINK_INPUT_BUTTON5] = true;
|
||||
|
||||
ShowQuickMessageBottom("(Use Shift-Escape to bring up the Dink HD menu!)");
|
||||
ShowQuickMessageBottom("(Use `wF1`` to bring up the Dink HD menu!)");
|
||||
return;
|
||||
}
|
||||
else
|
||||
|
|
@ -1121,12 +1123,31 @@ void OnArcadeInput(VariantList *pVList)
|
|||
LogMsg("Quitting");
|
||||
break;
|
||||
|
||||
case VIRTUAL_KEY_F1:
|
||||
case VIRTUAL_KEY_F4:
|
||||
|
||||
if (bIsDown)
|
||||
SaveStateWithExtra();
|
||||
break;
|
||||
|
||||
case VIRTUAL_KEY_F1:
|
||||
|
||||
if (bIsDown)
|
||||
{
|
||||
|
||||
Entity *pMenu = GetEntityRoot()->GetEntityByName("GameMenu");
|
||||
|
||||
if (pMenu)
|
||||
{
|
||||
if (!pMenu->GetEntityByName("PauseMenu"))
|
||||
{
|
||||
pMenu->RemoveComponentByName("FocusInput");
|
||||
PauseMenuCreate(pMenu);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case VIRTUAL_KEY_F8:
|
||||
{
|
||||
if (bIsDown)
|
||||
|
|
|
|||
|
|
@ -211,6 +211,8 @@ void MainMenuOnSelect(VariantList *pVList) //0=vec2 point of click, 1=entity sen
|
|||
|
||||
string GetNextDMODToInstall(bool &bIsCommandLineInstall, const bool bDeleteCommandLineParms)
|
||||
{
|
||||
|
||||
bIsCommandLineInstall = false;
|
||||
//if (!GetApp()->CanDownloadDMODS()) return ""; //ignore it
|
||||
|
||||
if (IsDesktop())
|
||||
|
|
|
|||
|
|
@ -403,6 +403,14 @@ Entity * PauseMenuCreate(Entity *pParentEnt)
|
|||
pKeys->GetVar("disabled")->Set(uint32(1));
|
||||
GetMessageManager()->SetComponentVariable(pKeys, 500, "disabled", uint32(0)); //enable it again
|
||||
|
||||
if (IsDesktop())
|
||||
{
|
||||
EntityComponent *pKeys = AddHotKeyToButton(pButtonEntity, VIRTUAL_KEY_F1);
|
||||
//work around problem of it instantly closing
|
||||
pKeys->GetVar("disabled")->Set(uint32(1));
|
||||
GetMessageManager()->SetComponentVariable(pKeys, 500, "disabled", uint32(0)); //enable it again
|
||||
}
|
||||
|
||||
/*
|
||||
pKeys = AddHotKeyToButton(pButtonEntity, VIRTUAL_KEY_PROPERTIES);
|
||||
//work around problem of it instantly closing
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
// "SetUnhandledExceptionFilter" and VC8
|
||||
// http://blog.kalmbachnet.de/?postid=75
|
||||
// and
|
||||
// Unhandled exceptions in VC8 and above… for x86 and x64
|
||||
// Unhandled exceptions in VC8 and above・for x86 and x64
|
||||
// http://blog.kalmbach-software.de/2008/04/02/unhandled-exceptions-in-vc8-and-above-for-x86-and-x64/
|
||||
// Even better: http://blog.kalmbach-software.de/2013/05/23/improvedpreventsetunhandledexceptionfilter/
|
||||
|
||||
|
|
|
|||
|
|
@ -192,6 +192,21 @@ byte * FFReader::LoadFFIntoMemory(int index, int *pSizeOut)
|
|||
return pMem;
|
||||
}
|
||||
|
||||
inline bool ends_with(const std::string & value, const std::string & ending)
|
||||
{
|
||||
if (ending.size() > value.size()) return false;
|
||||
return std::equal(ending.rbegin(), ending.rend(), value.rbegin());
|
||||
}
|
||||
|
||||
inline bool isBmpFile(const std::string& path)
|
||||
{
|
||||
return ends_with(path, ".bmp");
|
||||
}
|
||||
|
||||
inline std::string getPngPath(const std::string& path)
|
||||
{
|
||||
return path.substr(0, path.size() - 4) + ".png";
|
||||
}
|
||||
|
||||
byte * FFReader::LoadFileIntoMemory( string const &fName, int *pSizeOut, const string &fFirstFrame)
|
||||
{
|
||||
|
|
@ -199,7 +214,6 @@ byte * FFReader::LoadFileIntoMemory( string const &fName, int *pSizeOut, const s
|
|||
#ifdef _DEBUG
|
||||
//LogMsg("loading for %s", (m_basePath+fName).c_str());
|
||||
#endif
|
||||
int len;
|
||||
byte *pBuff = NULL;
|
||||
|
||||
bool bUsingDMODDirOnly = false;
|
||||
|
|
@ -208,7 +222,8 @@ byte * FFReader::LoadFileIntoMemory( string const &fName, int *pSizeOut, const s
|
|||
if (fFirstFrame != fName && !m_dmodGamePath.empty())
|
||||
{
|
||||
//what if load part of a sequence from the DMOD dir, but part from the DInk dir? That would be bad
|
||||
if (FileExists(m_dmodGamePath + m_basePath + fFirstFrame))
|
||||
if (FileExists(m_dmodGamePath + m_basePath + fFirstFrame) ||
|
||||
(isBmpFile(fFirstFrame) && FileExists(getPngPath(m_dmodGamePath + m_basePath + fFirstFrame))))
|
||||
{
|
||||
bUsingDMODDirOnly = true;
|
||||
}
|
||||
|
|
@ -220,10 +235,18 @@ byte * FFReader::LoadFileIntoMemory( string const &fName, int *pSizeOut, const s
|
|||
{
|
||||
//you know what? Let's do a last minute try in the dmod dir as well.
|
||||
|
||||
if (FileExists(m_dmodGamePath + m_dmodBasePath + fName))
|
||||
if (isBmpFile(fName) && FileExists(getPngPath(m_dmodGamePath + m_dmodBasePath + fName)))
|
||||
{
|
||||
//pBuff = LoadFileIntoMemoryBasic(m_dmodGamePath+m_basePath+fName, &len, false, false);
|
||||
pBuff = GetFileManager()->Get(m_dmodGamePath + m_dmodBasePath + fName, &len, false);
|
||||
pBuff = GetFileManager()->Get(getPngPath(m_dmodGamePath + m_dmodBasePath + fName), pSizeOut, false);
|
||||
|
||||
if (!pBuff) SetError(ERROR_LOW_MEM);
|
||||
return pBuff;
|
||||
}
|
||||
else if (FileExists(m_dmodGamePath + m_dmodBasePath + fName))
|
||||
{
|
||||
//pBuff = LoadFileIntoMemoryBasic(m_dmodGamePath+m_basePath+fName, &len, false, false);
|
||||
pBuff = GetFileManager()->Get(m_dmodGamePath + m_dmodBasePath + fName, pSizeOut, false);
|
||||
|
||||
if (!pBuff) SetError(ERROR_LOW_MEM);
|
||||
return pBuff;
|
||||
|
|
@ -246,23 +269,39 @@ byte * FFReader::LoadFileIntoMemory( string const &fName, int *pSizeOut, const s
|
|||
|
||||
if (!m_dmodGamePath.empty())
|
||||
{
|
||||
|
||||
if (FileExists(m_dmodGamePath+m_dmodBasePath+fName))
|
||||
if (isBmpFile(fName) && FileExists(getPngPath(m_dmodGamePath + m_dmodBasePath + fName)))
|
||||
{
|
||||
//pBuff = LoadFileIntoMemoryBasic(m_dmodGamePath+m_basePath+fName, &len, false, false);
|
||||
pBuff = GetFileManager()->Get(m_dmodGamePath+m_dmodBasePath+fName, &len,false);
|
||||
pBuff = GetFileManager()->Get(getPngPath(m_dmodGamePath + m_dmodBasePath + fName), pSizeOut, false);
|
||||
if (!pBuff) SetError(ERROR_LOW_MEM);
|
||||
return pBuff;
|
||||
}
|
||||
else if (FileExists(m_dmodGamePath+m_dmodBasePath+fName))
|
||||
{
|
||||
//pBuff = LoadFileIntoMemoryBasic(m_dmodGamePath+m_basePath+fName, &len, false, false);
|
||||
pBuff = GetFileManager()->Get(m_dmodGamePath+m_dmodBasePath+fName, pSizeOut,false);
|
||||
if (!pBuff) SetError(ERROR_LOW_MEM);
|
||||
return pBuff;
|
||||
}
|
||||
}
|
||||
|
||||
if (!bUsingDMODDirOnly)
|
||||
{
|
||||
if (isBmpFile(fName) && FileExists(getPngPath(m_gamePath + m_basePath + fName)))
|
||||
{
|
||||
//pBuff = LoadFileIntoMemoryBasic(m_gamePath+m_basePath+fName, &len, false, false);
|
||||
pBuff = GetFileManager()->Get(m_gamePath + m_basePath + fName, &len, false);
|
||||
if (len == UINT_MAX) SetError(ERROR_LOW_MEM);
|
||||
pBuff = GetFileManager()->Get(getPngPath(m_gamePath + m_basePath + fName), pSizeOut, false);
|
||||
if (*pSizeOut == UINT_MAX) SetError(ERROR_LOW_MEM);
|
||||
return pBuff;
|
||||
}
|
||||
else if (FileExists(m_gamePath + m_basePath + fName))
|
||||
{
|
||||
//pBuff = LoadFileIntoMemoryBasic(m_gamePath+m_basePath+fName, &len, false, false);
|
||||
pBuff = GetFileManager()->Get(m_gamePath + m_basePath + fName, pSizeOut, false);
|
||||
if (*pSizeOut == UINT_MAX) SetError(ERROR_LOW_MEM);
|
||||
return pBuff;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return NULL;
|
||||
|
|
|
|||
|
|
@ -1561,8 +1561,8 @@ bool LoadSpriteSingleFrame(string fNameBase, int seq, int oo, int picIndex, eTra
|
|||
if (oo < 10) fName += "0";
|
||||
fName += toString(oo) + ".bmp";
|
||||
|
||||
|
||||
byte *pMem = pReader->LoadFileIntoMemory(fName, NULL, fNameBase + "01.bmp");
|
||||
int pMemSize = 0;
|
||||
byte *pMem = pReader->LoadFileIntoMemory(fName, &pMemSize, fNameBase + "01.bmp");
|
||||
|
||||
if (g_dglos.g_seq[seq].m_spaceAllowed != 0)
|
||||
{
|
||||
|
|
@ -1633,7 +1633,7 @@ bool LoadSpriteSingleFrame(string fNameBase, int seq, int oo, int picIndex, eTra
|
|||
transType = TRANSPARENT_WHITE;
|
||||
}
|
||||
|
||||
g_pSpriteSurface[picIndex] = LoadBitmapIntoSurface("", transType, IDirectDrawSurface::MODE_SHADOW_GL, pMem, bUseCheckerboardFix);
|
||||
g_pSpriteSurface[picIndex] = LoadBitmapIntoSurface("", transType, IDirectDrawSurface::MODE_SHADOW_GL, pMem, pMemSize, bUseCheckerboardFix);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1858,10 +1858,11 @@ bool load_sprites(char org[512], int seq, int speed, int xoffset, int yoffset, r
|
|||
// LogMsg("Loading seq %d frame %d", seq, oo);
|
||||
}
|
||||
#endif
|
||||
if (oo <= C_MAX_SPRITE_FRAMES && reader.DoesFileExist(fNameBase+string(hold)+toString(oo)+".bmp", fNameBase + "01.bmp"))
|
||||
// 2 hours of debugging found that this is key to make 'png' graphics work.
|
||||
if (oo <= C_MAX_SPRITE_FRAMES && (reader.DoesFileExist(fNameBase+string(hold)+toString(oo)+".bmp", fNameBase + "01.bmp") ||
|
||||
reader.DoesFileExist(fNameBase+string(hold)+toString(oo)+".png", fNameBase + "01.png")))
|
||||
{
|
||||
g_dglos.g_curPicIndex++;
|
||||
|
||||
} else
|
||||
{
|
||||
if (oo == 1)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ void KillVideoEngine()
|
|||
|
||||
void dderror(int hErr){};
|
||||
|
||||
IDirectDrawSurface * LoadBitmapIntoSurface(const char *pName, eTransparencyType trans, IDirectDrawSurface::eMode mode, byte *pMem, bool bUseCheckerboardFix)
|
||||
IDirectDrawSurface * LoadBitmapIntoSurface(const char *pName, eTransparencyType trans, IDirectDrawSurface::eMode mode, byte *pMem, int pMemSize, bool bUseCheckerboardFix)
|
||||
{
|
||||
|
||||
IDirectDrawSurface * pSurf;
|
||||
|
|
@ -45,7 +45,7 @@ IDirectDrawSurface * LoadBitmapIntoSurface(const char *pName, eTransparencyType
|
|||
//LogMsg("loading DDRAW bmp from mem");
|
||||
#endif
|
||||
//if this is set, ignore the filename
|
||||
pSurf->m_pSurf->LoadFileFromMemory(pMem, SoftSurface::eColorKeyType(trans), 0, false, bUseCheckerboardFix);
|
||||
pSurf->m_pSurf->LoadFileFromMemory(pMem, SoftSurface::eColorKeyType(trans), pMemSize, false, bUseCheckerboardFix);
|
||||
} else
|
||||
{
|
||||
#ifdef _DEBUG
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ bool InitializeVideoSystem();
|
|||
void KillVideoEngine();
|
||||
void GetSizeOfSurface(IDirectDrawSurface *pdds, int *pX, int *pY);
|
||||
|
||||
IDirectDrawSurface * LoadBitmapIntoSurface(const char *pName, eTransparencyType trans= TRANSPARENT_NONE, IDirectDrawSurface::eMode mode = IDirectDrawSurface::MODE_SHADOW_GL, byte *pMem = NULL,
|
||||
IDirectDrawSurface * LoadBitmapIntoSurface(const char *pName, eTransparencyType trans= TRANSPARENT_NONE, IDirectDrawSurface::eMode mode = IDirectDrawSurface::MODE_SHADOW_GL, byte *pMem = NULL, int pMemSize = 0,
|
||||
bool bUseCheckerboardFix = false);
|
||||
|
||||
#endif // video_dx_h__
|
||||
|
|
@ -386,7 +386,7 @@
|
|||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\source;..\..\shared;..\..\shared\win\;..\..\shared\util\boost;..\..\shared\ClanLib-2.0\Sources;..\..\shared\win\include;..\..\shared\FliteTTS\include;..\..\shared\Irrlicht\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;BOOST_ALL_NO_LIB;C_GL_MODE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;_NO_DEBUG_HEAP=1;RT_JPG_SUPPORT;RT_DONT_DO_MOVE_TIMER_TRICK;RT_RUNS_IN_BACKGROUND_DISABLED;RT_IPV6;_USE_32BIT_TIME_T;RT_CUSTOM_LOGMSG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;BOOST_ALL_NO_LIB;C_GL_MODE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;_NO_DEBUG_HEAP=1;RT_JPG_SUPPORT;RT_DONT_DO_MOVE_TIMER_TRICK;RT_RUNS_IN_BACKGROUND_DISABLED;RT_IPV6;_USE_32BIT_TIME_T;RT_CUSTOM_LOGMSG;RT_PNG_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
|
|
@ -431,7 +431,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\source;..\..\shared;..\..\shared\win\;..\..\shared\util\boost;..\..\shared\ClanLib-2.0\Sources;..\..\shared\win\include;..\..\shared\FliteTTS\include;..\dxsdk\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;BOOST_ALL_NO_LIB;_USE_32BIT_TIME_T;C_GL_MODE;RT_JPG_SUPPORT;RT_DONT_DO_MOVE_TIMER_TRICK;RT_IPV6;RT_CUSTOM_LOGMSG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;BOOST_ALL_NO_LIB;_USE_32BIT_TIME_T;C_GL_MODE;RT_JPG_SUPPORT;RT_DONT_DO_MOVE_TIMER_TRICK;RT_IPV6;RT_CUSTOM_LOGMSG;RT_PNG_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>PlatformPrecomp.h</PrecompiledHeaderFile>
|
||||
|
|
@ -460,7 +460,7 @@
|
|||
<WarningLevel>Level3</WarningLevel>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<DisableSpecificWarnings>4267;4244;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;BOOST_ALL_NO_LIB;_USE_32BIT_TIME_T;C_GL_MODE;RT_JPG_SUPPORT;RT_DONT_DO_MOVE_TIMER_TRICK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;BOOST_ALL_NO_LIB;_USE_32BIT_TIME_T;C_GL_MODE;RT_JPG_SUPPORT;RT_DONT_DO_MOVE_TIMER_TRICK;RT_PNG_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>opengl32.lib;fmod64_vc.lib;zdll.lib;ws2_32.lib;dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
|
|
@ -2757,6 +2757,146 @@
|
|||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|x64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\png.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngerror.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngget.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngmem.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngpread.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngread.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngrio.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngrtran.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngrutil.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngset.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngtrans.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngvcrd.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngwio.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngwtran.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug WebOS|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL WinDir|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL AkikoBox|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Common Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Manager\AdManager.cpp" />
|
||||
<ClCompile Include="..\..\shared\Manager\Console.cpp" />
|
||||
<ClCompile Include="..\..\shared\Manager\GameTimer.cpp" />
|
||||
|
|
@ -3575,6 +3715,8 @@
|
|||
<ClInclude Include="..\..\shared\Irrlicht\source\Irrlicht\jpeglib\jpeglib.h" />
|
||||
<ClInclude Include="..\..\shared\Irrlicht\source\Irrlicht\jpeglib\jversion.h" />
|
||||
<ClInclude Include="..\..\shared\Irrlicht\source\Irrlicht\jpeglib\transupp.h" />
|
||||
<ClInclude Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\png.h" />
|
||||
<ClInclude Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngconf.h" />
|
||||
<ClInclude Include="..\..\shared\Manager\AdManager.h" />
|
||||
<ClInclude Include="..\..\shared\Manager\Console.h" />
|
||||
<ClInclude Include="..\..\shared\Manager\GameTimer.h" />
|
||||
|
|
|
|||
|
|
@ -167,6 +167,9 @@
|
|||
<Filter Include="source\StackWalker">
|
||||
<UniqueIdentifier>{13d115b8-2e63-4a6c-bd5e-a660ca6d16fc}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="shared\Renderer\libpng">
|
||||
<UniqueIdentifier>{7d52fbf0-de4b-498f-a8ef-a41773d0da66}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\source\App.cpp">
|
||||
|
|
@ -790,6 +793,48 @@
|
|||
<ClCompile Include="..\source\StackWalker\StackWalker.cpp">
|
||||
<Filter>source\StackWalker</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\png.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngerror.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngget.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngmem.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngpread.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngread.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngrio.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngrtran.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngrutil.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngset.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngtrans.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngvcrd.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngwio.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngwtran.c">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\source\App.h">
|
||||
|
|
@ -1350,6 +1395,12 @@
|
|||
<ClInclude Include="..\source\StackWalker\StackWalker.h">
|
||||
<Filter>source\StackWalker</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\png.h">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\shared\Irrlicht\source\Irrlicht\libpng\pngconf.h">
|
||||
<Filter>shared\Renderer\libpng</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="..\android\proguard\config.txt">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue