kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try uploading build files after completion

Browse Source
This commit is contained in:
Joshua Granick
2014-02-17 09:30:37 -08:00
parent 43e8b5bde0
commit f0068906d6
4 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
.travis.yml
View File

@@ -1,13 +1,28 @@
language: objective-c
before_install:
- brew install haxe
- mkdir ~/haxelib
- haxelib setup ~/haxelib
- haxelib git hxlibc https://github.com/openfl/hxlibc
- haxelib git lime-build https://github.com/openfl/lime-build
- haxelib dev lime $(pwd)
- gem install travis-artifacts
- brew install haxe
- mkdir ~/haxelib
- haxelib setup ~/haxelib
- haxelib git hxlibc https://github.com/openfl/hxlibc
- haxelib git lime-build https://github.com/openfl/lime-build
- haxelib dev lime $(pwd)
script:
- haxelib run lime rebuild mac
- haxelib run lime rebuild ios
- haxelib run lime rebuild mac
- haxelib run lime rebuild ios
after_success:
- travis-artifacts upload --path ndll/Mac/lime.ndll --target-path artifacts/$TRAVIS_COMMIT/Mac/lime.ndll"
- travis-artifacts upload --path ndll/Mac/lime-debug.ndll --target-path artifacts/$TRAVIS_COMMIT/Mac/lime-debug.ndll"
- travis-artifacts upload --path ndll/Mac64/lime.ndll --target-path artifacts/$TRAVIS_COMMIT/Mac64/lime.ndll"
- travis-artifacts upload --path ndll/Mac64/lime-debug.ndll --target-path artifacts/$TRAVIS_COMMIT/Mac64/lime-debug.ndll"
- travis-artifacts upload --path ndll/iPhone/liblime.iphoneos.a --target-path artifacts/$TRAVIS_COMMIT/iPhone/liblime.iphoneos.a"
- travis-artifacts upload --path ndll/iPhone/liblime.iphoneos-v7.a --target-path artifacts/$TRAVIS_COMMIT/iPhone/liblime.iphoneos-v7.a"
- travis-artifacts upload --path ndll/iPhone/liblime.iphonesim.a --target-path artifacts/$TRAVIS_COMMIT/iPhone/liblime.iphonesim.a"
- travis-artifacts upload --path ndll/iPhone/liblime-debug.iphoneos.a --target-path artifacts/$TRAVIS_COMMIT/iPhone/liblime-debug.iphoneos.a"
- travis-artifacts upload --path ndll/iPhone/liblime-debug.iphoneos-v7.a --target-path artifacts/$TRAVIS_COMMIT/iPhone/liblime-debug.iphoneos-v7.a"
- travis-artifacts upload --path ndll/iPhone/liblime-debug.iphonesim.a --target-path artifacts/$TRAVIS_COMMIT/iPhone/liblime-debug.iphonesim.a"
global:
- ARTIFACTS_AWS_REGION=us-west-2
- ARTIFACTS_S3_BUCKET=lime-osx-travis
- secure: DXYUyMpbecZVlLUHHSrTFyUeaOor2hBIktXgv2AnwbzTgiJeFshUbWA0hu2j3pnGDNlJJpmrdyKJPTsT1hGFZ9tLm5J6Q8j4wA04GBp+dJl0+7RBs/R767XcyIRkJNw4a1hZJCQgv++wWvJ4GhW/KM1uUUHL5dh+McfNBz6SXLs=
- secure: f0ps0Vor8x1p6rdzpAP67o6HkMIO2e3qFUiYIj+QJXkdzmmy7V3UHW3NxkOerzsiVkxksmB2MOocRCVlseWP72i/4qPrw/r8BpkmkO1SY/HdR1yv0g0DHwJw8i/zhRF390dvNQh/HR0SZrAeDQvKapwzkvQkUvwwp51O5xBLMbs=

1
project/Build.xml
View File

@@ -562,6 +562,7 @@
<lib name="-losp-appfw" if="tizen" />
<lib name="-losp-image" if="tizen" />
<lib name="-losp-ime" if="tizen" />
<lib name="-losp-json" if="tizen" />
<lib name="-losp-net" if="tizen" />
<lib name="-losp-content" if="tizen" />
<lib name="-losp-locations" if="tizen" />

10
project/include/renderer/opengl/OGL.h
View File

@@ -22,15 +22,15 @@
#elif defined(TIZEN)
//#include <osp/gl.h>
#include <FGraphicsOpengl.h>
//#include <FGraphicsOpengl2.h>
//#include <FGraphicsOpengl.h>
#include <FGraphicsOpengl2.h>
using namespace Tizen::Graphics::Opengl;
//#include <osp/gl2.h>
//#define ALLOW_OGL2
//#define LIME_FORCE_GLES2
#define LIME_FORCE_GLES1
#define ALLOW_OGL2
#define LIME_FORCE_GLES2
//#define LIME_FORCE_GLES1
#define LIME_GLES
#elif defined(IPHONE)

10
project/src/platform/tizen/TizenApplication.cpp
View File

@@ -24,6 +24,8 @@ namespace lime {
void CreateMainFrame (FrameCreationCallback inOnFrame, int inWidth, int inHeight, unsigned int inFlags, const char *inTitle, Surface *inIcon) {
AppLog ("Hello1");
sgCallback = inOnFrame;
sgWidth = inWidth;
sgHeight = inHeight;
@@ -66,6 +68,8 @@ namespace lime {
TizenApplication::TizenApplication (void) {
AppLog ("Hello");
//mAccelX = 0;
//mAccelY = 0;
//mAccelZ = 0;
@@ -124,6 +128,8 @@ namespace lime {
bool TizenApplication::OnAppInitializing (Tizen::App::AppRegistry& appRegistry) {
AppLog ("Init!");
Tizen::Ui::Controls::Frame* appFrame = new (std::nothrow) Tizen::Ui::Controls::Frame ();
appFrame->Construct ();
this->AddFrame (*appFrame);
@@ -156,7 +162,9 @@ namespace lime {
mSensorManager->AddSensorListener (*this, Tizen::Uix::Sensor::SENSOR_TYPE_ACCELERATION, interval, true);*/
bool ok = limeEGLCreate (mForm, sgWidth, sgHeight, 1, (sgFlags & wfDepthBuffer) ? 16 : 0, (sgFlags & wfStencilBuffer) ? 8 : 0, 0);
AppLog ("2");
bool ok = limeEGLCreate (mForm, sgWidth, sgHeight, 2, (sgFlags & wfDepthBuffer) ? 16 : 0, (sgFlags & wfStencilBuffer) ? 8 : 0, 0);
mTimer = new (std::nothrow) Tizen::Base::Runtime::Timer;
mTimer->Construct (*this);