Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-06-05 18:44:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved input handler

Browse Source
This commit is contained in:
Túlio Henrique 2015-07-28 07:55:27 -03:00
parent 57b9ad88eb
commit 0e87c8355b
13 changed files with 85 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,6 +12,7 @@ Makefile
/android/project/.settings
/android/project/.classpath
/android/project/.project
/android/project/.cproject
/android/project/local.properties
/android/project/project.properties
libs*

4
android/project/AndroidManifest.xml
View File

@ -3,7 +3,9 @@
<uses-sdk android:minSdkVersion="16"/>
<application android:label="@string/app_name"
<application
android:debuggable="true"
android:label="@string/app_name"
android:icon="@drawable/ic_launcher"
android:hardwareAccelerated="true" >

11
android/project/jni/Android.mk Normal file
View File

@ -0,0 +1,11 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libotclient
LOCAL_SRC_FILES := libotclient.so
include $(PREBUILT_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libSDL2
LOCAL_SRC_FILES := libSDL2.so
include $(PREBUILT_SHARED_LIBRARY)

2
android/project/jni/Application.mk Normal file
View File

@ -0,0 +1,2 @@
APP_PLATFORM := android-16
APP_ABI := armeabi-v7a

35
src/client/client.cpp
View File

@ -53,41 +53,6 @@ void Client::initAppFrameworkAndOTClient(std::vector<std::string>& args)
findLuaInitScript();
g_app.runAppMainLoop();
//TODO: restore options
/*
if(g_graphics.parseOption(arg))
continue;
if(arg == "-version" || arg == "--version" || arg == "-v") {
stdext::print(
m_appName, " ", m_appVersion, "\n"
"Buitt on: ", BUILD_DATE, "\n",
"Commit: ", BUILD_COMMIT, "\n",
"Compiled by: ", BUILD_COMPILER, "\n",
"Build type: ", BUILD_TYPE, "\n");
return;
} else if(arg == "-help" || arg == "--help" || arg == "-h" || arg == "-?" || arg == "/?") {
stdext::print(
"Usage: ", args[0], " [options]\n"
"Options:\n"
" -help Display this information and exit\n"
" -version Display version and exit\n"
" \n"
" -no-fbos Disable usage of opengl framebuffer objects\n"
" -no-mipmaps Disable texture mipmaping\n"
" -no-smooth Disable texture smoothing (bilinear filter)\n"
" -no-non-power-of-two-textures Use only power of two textures\n"
" -no-clamp-to-edge Don't use GL_CLAMP_TO_EDGE\n"
" -no-backbuffer-cache Don't allow backbuffer caching\n"
" -hardware-buffers Cache vertex arrays in hardware\n"
" -opengl1 Use OpenGL 1.x painter\n"
" -opengl2 Use OpenGL 2.0 painter\n");
return;
} else {
stdext::println("Unrecognized option '", arg, "', please see -help for available options list");
return;
}
*/
}
void Client::setupAppNameAndVersion() {

4
src/framework/global.h
View File

@ -44,4 +44,8 @@
// logger
#include "core/logger.h"
#ifdef ANDROID
#include <SDL.h>
#endif
#endif

46
src/framework/platform/sdlwindow.cpp
View File

@ -133,11 +133,6 @@ SDLWindow::SDLWindow() {
m_keyMap[SDLK_CARET] = Fw::KeyCaret;
m_keyMap[SDLK_UNDERSCORE] = Fw::KeyUnderscore;
m_keyMap[SDLK_BACKQUOTE] = Fw::KeyGrave;
//m_keyMap['{'] = Fw::KeyLeftCurly;
//m_keyMap['|'] = Fw::KeyBar;
//m_keyMap['}'] = Fw::KeyRightCurly;
//m_keyMap['~'] = Fw::KeyTilde;
// keypad
/*
@ -228,9 +223,6 @@ void SDLWindow::poll() {
while(SDL_PollEvent(&m_event)) {
processKeydownOrKeyrelease();
if(hasRepeatedKey())
continue;
switch(m_event.type) {
case SDL_TEXTINPUT:
processTextInput();
@ -240,30 +232,19 @@ void SDLWindow::poll() {
processFingerdownAndFingerup();
break;
case SDL_FINGERMOTION:
m_inputEvent.reset();
m_inputEvent.type = Fw::MouseMoveInputEvent;
Point newMousePos(m_event.tfinger.x * m_mode.w, m_event.tfinger.y * m_mode.h);
m_inputEvent.mouseMoved = newMousePos - m_inputEvent.mousePos;
m_inputEvent.mousePos = newMousePos;
if(m_onInputEvent)
m_onInputEvent(m_inputEvent);
processFingermotion();
break;
}
if(m_inputEvent.type != Fw::NoInputEvent && m_onInputEvent)
m_onInputEvent(m_inputEvent);
//if(m_inputEvent.type != Fw::NoInputEvent && m_onInputEvent)
// m_onInputEvent(m_inputEvent);
}
fireKeysPress();
}
bool SDLWindow::hasRepeatedKey() {
g_logger.info(stdext::format("hasRepeatedKey %i", m_event.key.repeat));
return m_event.key.repeat != 0;
}
void SDLWindow::processKeydownOrKeyrelease() {
if(m_event.key.state == SDL_PRESSED || (m_event.key.state == SDL_RELEASED && !hasRepeatedKey())) {
if(m_event.key.state == SDL_PRESSED || m_event.key.state == SDL_RELEASED) {
Fw::Key keyCode = Fw::KeyUnknown;
SDL_Keycode keysym = m_event.key.keysym.sym;
@ -281,7 +262,7 @@ void SDLWindow::processTextInput() {
std::string text = m_event.text.text;
SDL_Keycode keysym = m_event.key.keysym.sym;
if(text.length() == 0 || keysym == SDLK_BACKSPACE || keysym == SDLK_RETURN)
if(text.length() == 0 || keysym == SDLK_BACKSPACE || keysym == SDLK_RETURN || keysym == SDLK_AC_BACK || keysym == SDLK_DELETE)
return;
if(m_onInputEvent) {
@ -293,23 +274,36 @@ void SDLWindow::processTextInput() {
void SDLWindow::processFingerdownAndFingerup() {
bool isFinderdown = m_event.type == SDL_FINGERDOWN;
m_inputEvent.reset();
m_inputEvent.type = isFinderdown ? Fw::MousePressInputEvent : Fw::MouseReleaseInputEvent;
m_inputEvent.mouseButton = Fw::MouseLeftButton;
m_mouseButtonStates[Fw::MouseLeftButton] = isFinderdown;
Point newMousePos(m_event.tfinger.x * m_mode.w, m_event.tfinger.y * m_mode.h);
m_inputEvent.mouseMoved = newMousePos - m_inputEvent.mousePos;
m_inputEvent.mousePos = newMousePos;
if(m_onInputEvent)
m_onInputEvent(m_inputEvent);
}
void SDLWindow::processFingermotion() {
m_inputEvent.reset();
m_inputEvent.type = Fw::MouseMoveInputEvent;
Point newMousePos(m_event.tfinger.x * m_mode.w, m_event.tfinger.y * m_mode.h);
m_inputEvent.mouseMoved = newMousePos - m_inputEvent.mousePos;
m_inputEvent.mousePos = newMousePos;
if (m_onInputEvent)
m_onInputEvent(m_inputEvent);
}
void SDLWindow::swapBuffers() {
SDL_GL_SwapWindow(m_window);
}
void SDLWindow::setVerticalSync(bool enable) {
// TODO
SDL_GL_SetSwapInterval(enable);
}
std::string SDLWindow::getClipboardText() {
@ -326,7 +320,7 @@ Size SDLWindow::getDisplaySize() {
}
std::string SDLWindow::getPlatformType() {
return "ANDROID_SDL2";
return "MOBILE_SDL2";
}
void SDLWindow::show() {

2
src/framework/platform/sdlwindow.h
View File

@ -61,10 +61,10 @@ public:
void initializeSDL();
void setSDLAttributes();
bool hasRepeatedKey();
void processKeydownOrKeyrelease();
void processTextInput();
void processFingerdownAndFingerup();
void processFingermotion();
protected:
int internalLoadMouseCursor(const ImagePtr& image, const Point& hotSpot);

5
src/framework/ui/uitextedit.cpp
View File

@ -659,8 +659,13 @@ void UITextEdit::onFocusChange(bool focused, Fw::FocusReason reason)
else
blinkCursor();
update(true);
#ifdef ANDROID
SDL_StartTextInput();
#endif
} else if(m_selectable)
clearSelection();
UIWidget::onFocusChange(focused, reason);
}

6
src/main.cpp
View File

@ -20,11 +20,6 @@
* THE SOFTWARE.
*/
// The only way that the android sdl library can link a main function it's including SDL.h
#ifdef ANDROID
#include <SDL.h>
#endif
#include <client/client.h>
int main(int argc, char* argv[])
@ -34,3 +29,4 @@ int main(int argc, char* argv[])
return 0;
}

4
vc12/otclient.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2013 for Windows Desktop
VisualStudioVersion = 12.0.21005.1
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "otclient", "otclient.vcxproj", "{17A8F78F-1FFB-4128-A3B3-59CC6C19D89A}"
EndProject

40
vc12/otclient.vcxproj
View File

@ -66,28 +66,38 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>D:\otclient-msvc13-libs\libogg-1.3.1\include;D:\otclient-msvc13-libs\libvorbis-1.3.3\include;D:\otclient-msvc13-libs\physfs-2.0.3\include;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\include;D:\otclient-msvc13-libs\zlib-1.2.5\include;D:\otclient-msvc13-libs\OpenAL\include\AL;D:\otclient-msvc13-libs\glew-1.10.0\include;D:\otclient-msvc13-libs\LuaJIT-2.0.2\include;D:\otclient-msvc13-libs\boost_1_55_0\include;D:\otclient\src;..\src;$(IncludePath)</IncludePath>
<LibraryPath>D:\otclient-msvc13-libs\libogg-1.3.1\lib;D:\otclient-msvc13-libs\libvorbis-1.3.3\lib;D:\otclient-msvc13-libs\physfs-2.0.3\lib;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;D:\otclient-msvc13-libs\zlib-1.2.5\lib;D:\otclient-msvc13-libs\OpenAL\lib;D:\otclient-msvc13-libs\LuaJIT-2.0.2\lib;D:\otclient-msvc13-libs\glew-1.10.0\lib;D:\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</LibraryPath>
<IncludePath>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\include\AL;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\include;$(OTCLIENT_PATH)\src;$(IncludePath)</IncludePath>
<LibraryPath>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</LibraryPath>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>D:\otclient-msvc13-libs\libogg-1.3.1\include;D:\otclient-msvc13-libs\libvorbis-1.3.3\include;D:\otclient-msvc13-libs\physfs-2.0.3\include;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\include;D:\otclient-msvc13-libs\zlib-1.2.5\include;D:\otclient-msvc13-libs\OpenAL\include\AL;D:\otclient-msvc13-libs\glew-1.10.0\include;D:\otclient-msvc13-libs\LuaJIT-2.0.2\include;D:\otclient-msvc13-libs\boost_1_55_0\include;D:\otclient\src;..\src;$(IncludePath)</IncludePath>
<LibraryPath>D:\otclient-msvc13-libs\libogg-1.3.1\lib;D:\otclient-msvc13-libs\libvorbis-1.3.3\lib;D:\otclient-msvc13-libs\physfs-2.0.3\lib;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;D:\otclient-msvc13-libs\zlib-1.2.5\lib;D:\otclient-msvc13-libs\OpenAL\lib;D:\otclient-msvc13-libs\LuaJIT-2.0.2\lib;D:\otclient-msvc13-libs\glew-1.10.0\lib;D:\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</LibraryPath>
<IncludePath>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\include\AL;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\include;$(OTCLIENT_PATH)\src;$(IncludePath)</IncludePath>
<LibraryPath>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>C:\otclient-msvc13-libs\libogg-1.3.1\include;C:\otclient-msvc13-libs\libvorbis-1.3.3\include;C:\otclient-msvc13-libs\physfs-2.0.3\include;C:\otclient-msvc13-libs\OpenSSL-1.0.1e\include;C:\otclient-msvc13-libs\zlib-1.2.5\include;C:\otclient-msvc13-libs\OpenAL\include\AL;C:\otclient-msvc13-libs\glew-1.10.0\include;C:\otclient-msvc13-libs\LuaJIT-2.0.2\include;C:\otclient-msvc13-libs\boost_1_55_0\include;..\src;$(IncludePath)</IncludePath>
<LibraryPath>C:\otclient-msvc13-libs\libogg-1.3.1\lib;C:\otclient-msvc13-libs\libvorbis-1.3.3\lib;C:\otclient-msvc13-libs\physfs-2.0.3\lib;C:\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;C:\otclient-msvc13-libs\zlib-1.2.5\lib;C:\otclient-msvc13-libs\OpenAL\lib;C:\otclient-msvc13-libs\LuaJIT-2.0.2\lib;C:\otclient-msvc13-libs\glew-1.10.0\lib;C:\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</LibraryPath>
<IncludePath>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\include;$(OTCLIENT_PATH)\src;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\include\AL;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\include;$(IncludePath)</IncludePath>
<LibraryPath>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>D:\otclient-msvc13-libs\libogg-1.3.1\include;D:\otclient-msvc13-libs\libvorbis-1.3.3\include;D:\otclient-msvc13-libs\physfs-2.0.3\include;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\include;D:\otclient-msvc13-libs\zlib-1.2.5\include;D:\otclient-msvc13-libs\OpenAL\include\AL;D:\otclient-msvc13-libs\glew-1.10.0\include;D:\otclient-msvc13-libs\LuaJIT-2.0.2\include;D:\otclient-msvc13-libs\boost_1_55_0\include;D:\otclient\src;..\src;$(IncludePath)</IncludePath>
<LibraryPath>D:\otclient-msvc13-libs\libogg-1.3.1\lib;D:\otclient-msvc13-libs\libvorbis-1.3.3\lib;D:\otclient-msvc13-libs\physfs-2.0.3\lib;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;D:\otclient-msvc13-libs\zlib-1.2.5\lib;D:\otclient-msvc13-libs\OpenAL\lib;D:\otclient-msvc13-libs\LuaJIT-2.0.2\lib;D:\otclient-msvc13-libs\glew-1.10.0\lib;D:\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</LibraryPath>
<IncludePath>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\include\AL;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\include;$(OTCLIENT_PATH)\src;$(IncludePath)</IncludePath>
<LibraryPath>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;BOT_PROTECTION;CLIENT;CRASH_HANDLER;FW_GRAPHICS;FW_NET;FW_SOUND;FW_XML;BUILD_TYPE="RelWithDebInfo";BUILD_COMMIT="devel";BUILD_REVISION="0";VERSION="0.6.3";"BUILD_REVISION=\"0\"";"VERSION=\"0.6.3\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;BOT_PROTECTION;CLIENT;CRASH_HANDLER;FW_GRAPHICS;FW_NET;FW_SOUND;FW_XML;BUILD_TYPE="RelWithDebInfo";BUILD_COMMIT="devel";BUILD_REVISION="0";VERSION="0.6.3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)\$(Platform)\src\%(RelativeDir)\</ObjectFileName>
<AdditionalIncludeDirectories>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\include\AL;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\include;$(OTCLIENT_PATH)\src</AdditionalIncludeDirectories>
<IntrinsicFunctions>true</IntrinsicFunctions>
<Optimization>MaxSpeed</Optimization>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WholeProgramOptimization>true</WholeProgramOptimization>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -96,6 +106,8 @@
<LargeAddressAware>true</LargeAddressAware>
<SubSystem>Windows</SubSystem>
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
<AdditionalLibraryDirectories>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\lib</AdditionalLibraryDirectories>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -105,6 +117,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;BOT_PROTECTION;CLIENT;CRASH_HANDLER;FW_GRAPHICS;FW_NET;FW_SOUND;FW_XML;BUILD_TYPE="RelWithDebInfo";BUILD_COMMIT="devel";BUILD_REVISION="0";VERSION="0.6.3";"BUILD_REVISION=\"0\"";"VERSION=\"0.6.3\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)\$(Platform)\src\%(RelativeDir)\</ObjectFileName>
<AdditionalIncludeDirectories>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\include\AL;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\include;$(OTCLIENT_PATH)\src;$(IncludePath)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -113,6 +126,7 @@
<LargeAddressAware>true</LargeAddressAware>
<SubSystem>Windows</SubSystem>
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
<AdditionalLibraryDirectories>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -125,6 +139,7 @@
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;BOT_PROTECTION;CLIENT;CRASH_HANDLER;FW_GRAPHICS;FW_NET;FW_SOUND;FW_XML;BUILD_TYPE="RelWithDebInfo";BUILD_COMMIT="devel";BUILD_REVISION="0";VERSION="0.6.3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ObjectFileName>$(IntDir)\$(Platform)\src\%(RelativeDir)\</ObjectFileName>
<AdditionalIncludeDirectories>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\include\AL;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\include;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\include;$(OTCLIENT_PATH)\src;$(IncludePath)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -135,6 +150,7 @@
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
<LargeAddressAware>true</LargeAddressAware>
<AdditionalLibraryDirectories>$(LIBRARIES_DIR)\otclient-msvc13-libs\libogg-1.3.1\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\libvorbis-1.3.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\physfs-2.0.3\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;$(LIBRARIES_DIR)\otclient-msvc13-libs\zlib-1.2.5\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\OpenAL\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\LuaJIT-2.0.2\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\glew-1.10.0\lib;$(LIBRARIES_DIR)\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -271,6 +287,7 @@
<ClCompile Include="..\src\framework\otml\otmlparser.cpp" />
<ClCompile Include="..\src\framework\platform\platform.cpp" />
<ClCompile Include="..\src\framework\platform\platformwindow.cpp" />
<ClCompile Include="..\src\framework\platform\sdlwindow.cpp" />
<ClCompile Include="..\src\framework\platform\win32crashhandler.cpp" />
<ClCompile Include="..\src\framework\platform\win32platform.cpp" />
<ClCompile Include="..\src\framework\platform\win32window.cpp" />
@ -430,6 +447,7 @@
<ClInclude Include="..\src\framework\platform\crashhandler.h" />
<ClInclude Include="..\src\framework\platform\platform.h" />
<ClInclude Include="..\src\framework\platform\platformwindow.h" />
<ClInclude Include="..\src\framework\platform\sdlwindow.h" />
<ClInclude Include="..\src\framework\platform\win32window.h" />
<ClInclude Include="..\src\framework\sound\combinedsoundsource.h" />
<ClInclude Include="..\src\framework\sound\declarations.h" />
@ -491,4 +509,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

6
vc12/otclient.vcxproj.filters
View File

@ -531,6 +531,9 @@
<ClCompile Include="..\src\client\animator.cpp">
<Filter>Source Files\client</Filter>
</ClCompile>
<ClCompile Include="..\src\framework\platform\sdlwindow.cpp">
<Filter>Source Files\framework\platform</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\framework\const.h">
@ -1055,6 +1058,9 @@
<ClInclude Include="..\src\client\animator.h">
<Filter>Header Files\client</Filter>
</ClInclude>
<ClInclude Include="..\src\framework\platform\sdlwindow.h">
<Filter>Header Files\framework\platform</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\src\otcicon.rc">