Merge pull request #3364 from thedax/master

Fix Android, SDL(for real this time), and on Win32, place CwCheatScreen.cpp/h under the correct filter folder.
This commit is contained in:
Henrik Rydgård 2013-08-24 10:31:47 -07:00
commit aa52c5495d
3 changed files with 6 additions and 2 deletions

View File

@ -34,7 +34,7 @@
#include "UI/GameInfoCache.h"
#include "UI/MiscScreens.h"
#include "UI/CwCheatScreen.h"
#include "UI/view.h"
bool enableAll = false;
static std::vector<std::string> cheatList;
extern void DrawBackground(float alpha);

View File

@ -28,6 +28,9 @@
<ClCompile Include="ControlMappingScreen.cpp">
<Filter>Screens</Filter>
</ClCompile>
<ClCompile Include="CwCheatScreen.cpp">
<Filter>Screens</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="GameInfoCache.h" />
@ -56,7 +59,7 @@
<ClInclude Include="ControlMappingScreen.h">
<Filter>Screens</Filter>
</ClInclude>
<ClInclude Include="Header.h">
<ClInclude Include="CwCheatScreen.h">
<Filter>Screens</Filter>
</ClInclude>
</ItemGroup>

View File

@ -141,6 +141,7 @@ LOCAL_SRC_FILES := \
$(SRC)/UI/GameScreen.cpp \
$(SRC)/UI/ControlMappingScreen.cpp \
$(SRC)/UI/GameSettingsScreen.cpp \
$(SRC)/UI/CwCheatScreen.cpp \
$(SRC)/native/android/app-android.cpp \
$(SRC)/ext/disarm.cpp \
$(SRC)/ext/libkirk/AES.c \