salmon-engine-projects/double-hit-balls
9
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Vladislav Khorev 2013-02-05 20:45:59 +00:00
parent 0330316aca
commit d62faea65d
6 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ios/doublehitballs/ios_api.cpp
View File

@ -1,21 +1,24 @@
#include "include/Engine.h" #include "include/Engine.h"
#include "main_code.h" #include "main_code.h"
TAndroidApplication* App = NULL; TMyApplication* App;
extern "C" void AppInit() extern "C" void AppInit()
{ {
App = new TAndroidApplication; CreateEngine();
//App->OuterInit(320, 480, 320, 480); App = new TMyApplication;
App->OuterInit(480, 320, 480, 320); App->OuterInit(480, 320, 480, 320);
} }
extern "C" void AppDeinit() extern "C" void AppDeinit()
{ {
App->OuterDeinit(); App->OuterDeinit();
delete App; delete App;
DestroyEngine();
} }
@ -41,9 +44,12 @@ extern "C" void AppOnTapUp(int posx, int posy)
App->OuterOnTapUp(vec2(posx, posy)); App->OuterOnTapUp(vec2(posx, posy));
} }
extern "C" void AppOnTapUpAfterScroll(int posx, int posy)
{
App->OuterOnTapUpAfterShift(vec2(posx, posy));
}
extern "C" void AppOnScroll(int shiftx, int shifty) extern "C" void AppOnScroll(int shiftx, int shifty)
{ {
App->OuterOnMove(vec2(shiftx, shifty)); App->OuterOnMove(vec2(shiftx, shifty));
} }

7
jni/Android.mk
View File

@ -33,7 +33,7 @@ ZIP_PATH = $(LibsPathCygwin)/julienr-libzip-android/jni
#====== ENGINE AND LIBS ===================== #====== ENGINE AND LIBS =====================
include $(ENGINE_PATH)/Android_Engine.mk include $(ENGINE_PATH)/Android_Salmon_Engine.mk
#================= THE GAME ======================= #================= THE GAME =======================
@ -42,12 +42,13 @@ LOCAL_PATH:= $(LPATH)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CFLAGS := -DTARGET_ANDROID -DTARGET_HALIBUT -std=gnu++11 LOCAL_CFLAGS := -DTARGET_ANDROID -std=gnu++11 --std=c++11
LOCAL_STATIC_LIBRARIES := boost LOCAL_STATIC_LIBRARIES := boost
LOCAL_STATIC_LIBRARIES += squirrel LOCAL_STATIC_LIBRARIES += squirrel
LOCAL_STATIC_LIBRARIES += png_lib LOCAL_STATIC_LIBRARIES += png_lib
LOCAL_STATIC_LIBRARIES += zip LOCAL_STATIC_LIBRARIES += zip
LOCAL_SHARED_LIBRARIES := HalibutEngine LOCAL_SHARED_LIBRARIES := SalmonEngine
LOCAL_SHARED_LIBRARIES += gnustl_shared
LOCAL_C_INCLUDES := $(ENGINE_PATH) LOCAL_C_INCLUDES := $(ENGINE_PATH)
LOCAL_C_INCLUDES += $(BOOST_PATH) LOCAL_C_INCLUDES += $(BOOST_PATH)
LOCAL_C_INCLUDES += $(VORBIS_PATH)/include LOCAL_C_INCLUDES += $(VORBIS_PATH)/include

BIN
windows/DoubleHitBalls-win/Debug/DoubleHitBalls-win.exe
View File

Binary file not shown.

BIN
windows/DoubleHitBalls-win/Debug/DoubleHitBalls-win.exp
View File

Binary file not shown.

BIN
windows/DoubleHitBalls-win/Debug/DoubleHitBalls-win.lib
View File

Binary file not shown.

4
windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj
View File

@ -53,7 +53,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;TARGET_WIN32;TARGET_SALMON;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;TARGET_WIN32;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510;$(SolutionDir)\..\..\jni;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510;$(SolutionDir)\..\..\jni;</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503</DisableSpecificWarnings> <DisableSpecificWarnings>4503</DisableSpecificWarnings>
</ClCompile> </ClCompile>
@ -72,7 +72,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TARGET_WIN32;TARGET_SALMON;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TARGET_WIN32;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510;$(SolutionDir)\..\..\jni;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510;$(SolutionDir)\..\..\jni;</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503</DisableSpecificWarnings> <DisableSpecificWarnings>4503</DisableSpecificWarnings>
</ClCompile> </ClCompile>