Tries to fix SDL and Qt builds, introduces Emscripten in Travis.
This commit is contained in:
@@ -17,6 +17,8 @@ matrix:
|
|||||||
- os: android
|
- os: android
|
||||||
language: android
|
language: android
|
||||||
env: BUILD_TYPE=ANDROID
|
env: BUILD_TYPE=ANDROID
|
||||||
|
- os: osx
|
||||||
|
env: BUILD_TYPE=Emscripten
|
||||||
|
|
||||||
android:
|
android:
|
||||||
components:
|
components:
|
||||||
@@ -69,6 +71,10 @@ before_install:
|
|||||||
- if [ "$BUILD_TYPE" == "SDL" ]; then
|
- if [ "$BUILD_TYPE" == "SDL" ]; then
|
||||||
export SDL2DIR="$TRAVIS_BUILD_DIR/thirdparty/SDL2";
|
export SDL2DIR="$TRAVIS_BUILD_DIR/thirdparty/SDL2";
|
||||||
fi
|
fi
|
||||||
|
# Building for Emscripten here
|
||||||
|
- if [ "$BUILD_TYPE" == "Emscripten" ]; then
|
||||||
|
brew install emscripten && export LLVM=/usr/local/opt/emscripten/libexec/llvm/bin && emcc;
|
||||||
|
fi
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
|
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
|
||||||
|
|||||||
@@ -135,6 +135,8 @@ public:
|
|||||||
#elif (defined WIN32)
|
#elif (defined WIN32)
|
||||||
std::string filename;
|
std::string filename;
|
||||||
void* mSample;
|
void* mSample;
|
||||||
|
#else
|
||||||
|
void* mSample;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ void DownloadRequest::fileDownloaded()
|
|||||||
|
|
||||||
// let's check some error
|
// let's check some error
|
||||||
if(mNetworkReply->error() != QNetworkReply::NoError) {
|
if(mNetworkReply->error() != QNetworkReply::NoError) {
|
||||||
processError(mNetworkReply->error(), mNetworkReply->errorString().toStdString());
|
processError((int)mNetworkReply->error(), mNetworkReply->errorString().toStdString().c_str());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -51,6 +51,15 @@ if [ "$BUILD_TYPE" = "ANDROID" ]; then
|
|||||||
cd ..
|
cd ..
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# we're building an Emscripten HTML here
|
||||||
|
if [ "$BUILD_TYPE" = "Emscripten" ]; then
|
||||||
|
mkdir build_emscripten
|
||||||
|
cd build_emscripten
|
||||||
|
emcmake cmake -DCMAKE_BUILD_TYPE=Release ..
|
||||||
|
emmake make -j4
|
||||||
|
cd ..
|
||||||
|
fi
|
||||||
|
|
||||||
# we're building a Qt version with GUI here
|
# we're building a Qt version with GUI here
|
||||||
if [ "$BUILD_TYPE" = "Qt" ]; then
|
if [ "$BUILD_TYPE" = "Qt" ]; then
|
||||||
mkdir build_qt_widget
|
mkdir build_qt_widget
|
||||||
|
|||||||
Reference in New Issue
Block a user