From 52cc7bcd2e6fa4fbc04ddfb62ba484478d0833cf Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 22 Sep 2016 00:03:25 +0200 Subject: [PATCH 1/4] Enable Travis-CI service (By @Gawaboumga) Former-commit-id: c1d99b6d4143e8836ee0d78ff63069876c9ad79d [formerly ad183fdb6a31e9e7f7dfcde5000cf028a63df0b7] [formerly abd770532214b16cb0a30c11fb33eb36b6bb8198 [formerly 3bb0d4d7574707a52feb54ce585709f2fe53f8f7]] Former-commit-id: ff3f54eb9ea724597bd7b90ed48a8abc407f6a98 [formerly c922a4b3af5daae9555e4dfb645891e648588e7d] Former-commit-id: 59d8e6ffc8ebcf5cb9b92e50b5d2507e7930d962 --- .travis.yml | 25 +++++++++++++++++++++++++ Dockerfile | 11 +++++++++++ 2 files changed, 36 insertions(+) create mode 100644 .travis.yml create mode 100644 Dockerfile diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..0b3fef862 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,25 @@ +language: cpp +sudo: required +services: + - docker + +before_install: + - docker build -t nazara . + +script: + - docker run -v `pwd`:/NazaraEngine nazara + sh -c "cd build && + ./premake5-linux64 --with-examples gmake && + cd gmake && + make -j4 -f NazaraEngine.make && + cd ../../tests && + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../lib/gmake/x64/:../extlibs/lib/gmake/x64/ + " + +notifications: + email: true + +branches: + only: + - master + diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..ac2568e3c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM ubuntu:xenial + +RUN apt-get update && apt-get -y install && \ + apt-get install -y libssl1.0.0 libssl-dev && \ + apt-get install -y libopenal-dev libsndfile1-dev && \ + apt-get install -y libxcb-cursor-dev libxcb-ewmh-dev libxcb-randr0-dev libxcb-icccm4-dev libxcb-keysyms1-dev libx11-dev libfreetype6-dev && \ + apt-get install -y mesa-common-dev libgl1-mesa-dev && \ + apt-get install -y libassimp-dev + +RUN mkdir /NazaraEngine +WORKDIR /NazaraEngine From 9b72dc7f167640d535b5713686e2bd635664282f Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 22 Sep 2016 00:14:34 +0200 Subject: [PATCH 2/4] Dummy (checking Travis) Former-commit-id: 0a4750c4c18149a2fddccfc697ab4b077a4e40ed [formerly 1580efe5b88277bf0dd89116c8ba1adbe5fe7aef] [formerly 8f3722003187e02f6eb72f60b137450dd0202d5f [formerly bc6639eb71a842a731a5333aeae0c7a03cc56834]] Former-commit-id: d1ac46f69ae170fe2a10f74888610ed9bbb8c1ab [formerly aa852c6891a41d4a3cb844ebcc6ee48d32fcd9b1] Former-commit-id: 87a4634a7c238b7b2243ebc7b5cbe401b5b782fc --- dummy.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 dummy.txt diff --git a/dummy.txt b/dummy.txt new file mode 100644 index 000000000..390c386b7 --- /dev/null +++ b/dummy.txt @@ -0,0 +1 @@ +Remove me \ No newline at end of file From f3eaadcd8bb39a44e436fae3630eae7f91346f58 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 22 Sep 2016 00:26:34 +0200 Subject: [PATCH 3/4] Sdk/Application: Fix wrong inline constructor Thanks Travis-CI ! Former-commit-id: 40bde8de004459e30e45b45005d8a7680ae321ca [formerly 94921ad26e3e4d8d8980a2002618b1b8bc134d23] [formerly abfe68167af6aee324ec64a1d55114c63f364ceb [formerly 79ab743755f65fd23200091380187675b2af7281]] Former-commit-id: 487d2ae56048c786e08f9b6b69d34483cabd6517 [formerly 28cef4f85f78fa47fb28430b75c0c7550b79c8a5] Former-commit-id: 3ce94333b5d83df940384dddac64e41cf3b5a5d2 --- SDK/src/NDK/Application.cpp | 2 +- dummy.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 dummy.txt diff --git a/SDK/src/NDK/Application.cpp b/SDK/src/NDK/Application.cpp index 3cdff6978..46e1db13d 100644 --- a/SDK/src/NDK/Application.cpp +++ b/SDK/src/NDK/Application.cpp @@ -34,7 +34,7 @@ namespace Ndk * * \remark Only one Application instance can exist at a time */ - inline Application::Application(int argc, char* argv[]) : + Application::Application(int argc, char* argv[]) : Application() { std::regex optionRegex(R"(-(\w+))"); diff --git a/dummy.txt b/dummy.txt deleted file mode 100644 index 390c386b7..000000000 --- a/dummy.txt +++ /dev/null @@ -1 +0,0 @@ -Remove me \ No newline at end of file From 61ea7f3e0e590e6c87616e93ab442ee5b9be9e28 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 22 Sep 2016 00:54:04 +0200 Subject: [PATCH 4/4] Update readme Former-commit-id: 8e947ba710497070000ad834748eb6890e8079e0 [formerly 5cf6c0d507dd97b5b0934472c2a57d3442893cb6] [formerly 9fc16ab88c14c0da4306e040be89c4c6ea54816e [formerly acb28d545ce7d6ba366f69de3a3499a99b063807]] Former-commit-id: 688f139d2c6ff77cd218cb1319033eb18a63f304 [formerly 92cf401113dac5e442ceed89c403e8fac15d3fef] Former-commit-id: a94d7513ddbf716c8936840bb8d30dc04da532b5 --- readme.md | 33 ++++++++++++++++++++------------- readme_fr.md | 29 ++++++++++++++++++----------- 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/readme.md b/readme.md index 90a30fda5..eefdc2d76 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,10 @@ -Nazara Engine -============= +Platform | Build Status +------------ | ------------- +Windows | [![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/dj5qx7axym4uakmy/branch/master?svg=true)](https://ci.appveyor.com/project/DPSLynix/nazaraengine/branch/master) +Linux | [![Travis CI Build Status](https://travis-ci.org/DigitalPulseSoftware/NazaraEngine.svg)](https://travis-ci.org/DigitalPulseSoftware/NazaraEngine) + +# Nazara Engine +------- Nazara Engine is a fast, complete, cross-platform, object-oriented API which can help you in your daily developper life. Its goal is to provide a set of useful classes : Its core provides unicode strings, filesystem access, hashs, threads, ... @@ -8,26 +13,26 @@ It also provide a set of libraries, such as audio, network, physics, renderer, 2 You can use it in any kind of commercial/non-commercial applications without any restriction ([MIT license](http://opensource.org/licenses/MIT)). -Authors +## Authors ------- Jérôme "Lynix" Leclercq - main developper () Rémi "overdrivr" Bèges - developper & helper - Noise Module - () -Install +## Install ------- Use the premake build system in the build directory then compile the engine for your platform. -How to use +## How to use ---------- You can find tutorials on installation, compilation and use on the [official wiki](https://github.com/DigitalPulseSoftware/NazaraEngine/wiki) -Contribute +## Contribute ---------- -#####Don't hesitate to contribute to Nazara Engine by:##### +##### Don't hesitate to contribute to Nazara Engine by: - Extending the [wiki](https://github.com/DigitalPulseSoftware/NazaraEngine/wiki) - Submitting a patch to GitHub - Post suggestions/bugs on the forum or the [GitHub tracker](https://github.com/DigitalPulseSoftware/NazaraEngine/issues) @@ -35,14 +40,16 @@ Contribute - Talking about Nazara Engine to other people - Doing anything else that might help us -Links ------ -[Website](http://www.digitalpulsesoftware.net) +## Links +---------- +[Website](https://nazara.digitalpulsesoftware.net) [Wiki](https://github.com/DigitalPulseSoftware/NazaraEngine/wiki) -[Forum](http://forum.digitalpulsesoftware.net) +[Forum](https://forum.digitalpulsesoftware.net) +[Mattermost](https://mattermost.digitalpulsesoftware.net) -###Thanks to:### +## Thanks to: +---------- - **RafBill** and **Raakz:** Finding bugs and/or testing - **Fissal "DrFisher" Hannoun**: Helping a lot in architecture design - **Alexandre "Danman" Janniaux**: Helping making the POSIX implementation -- **Youri "Gawaboumga" Hubaut**: Improving the engine code by merging on GitHub +- **Youri "Gawaboumga" Hubaut**: Improving the whole project by making the documentation, improving the code, and more. diff --git a/readme_fr.md b/readme_fr.md index fd0f42e7b..e88d8fb88 100644 --- a/readme_fr.md +++ b/readme_fr.md @@ -1,5 +1,10 @@ -Nazara Engine -============= +Platforme | Build Status +------------ | ------------- +Windows | [![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/dj5qx7axym4uakmy/branch/master?svg=true)](https://ci.appveyor.com/project/DPSLynix/nazaraengine/branch/master) +Linux | [![Travis CI Build Status](https://travis-ci.org/DigitalPulseSoftware/NazaraEngine.svg)](https://travis-ci.org/DigitalPulseSoftware/NazaraEngine) + +# Nazara Engine +------- Nazara Engine est une API rapide, complète, portable et orientée-objet qui peut vous aider dans votre vie de développeur de tous les jours. Son objectif est de fournir un ensemble de classes utiles : Son noyau dispose de chaînes de caractères unicode, de gestion du système de fichiers, hashs, threads, ... @@ -8,26 +13,26 @@ Il propose aussi un ensemble de bibliothèques, comme audio, réseau, physique, Vous pouvez également l'utiliser pour toute application commerciale sans aucune contrainte ([Licence MIT](http://opensource.org/licenses/MIT)). -Auteurs +## Auteurs ------- Jérôme "Lynix" Leclercq - développeur principal () Rémi "overdrivr" Bèges - développeur & aide - module Noise - () -Installation +## Installation ------------ Utilisez le système premake pour construire le projet du moteur, dans le dossier build, pour ensuite compiler le moteur pour votre plateforme. -Utilisation +## Utilisation ----------- Vous pouvez lire des tutoriaux sur l'installation, la compilation et l'utilisation sur le [wiki officiel](https://github.com/DigitalPulseSoftware/NazaraEngine/wiki) (**\*En cours de rédaction***) -Contribution +## Contribution ---------- -#####N'hésitez pas à contribuer à Nazara Engine en :##### +##### N'hésitez pas à contribuer à Nazara Engine en : - Contribuant au [wiki](https://github.com/DigitalPulseSoftware/NazaraEngine/wiki) (**\*Lien brisé***) - Soumettant un patch sur GitHub - Postant des suggestions/bugs sur le forum ou sur le [tracker GitHub](https://github.com/DigitalPulseSoftware/NazaraEngine/issues) @@ -35,14 +40,16 @@ Contribution - Parlant du Nazara Engine à d'autres personnes - Faisant n'importe quoi d'autre qui pourrait nous aider -Liens ------ +## Liens +---------- [Website](http://www.digitalpulsesoftware.net) [Wiki](https://github.com/DigitalPulseSoftware/NazaraEngine/wiki) [Forum](http://forum.digitalpulsesoftware.net) +[Mattermost](https://mattermost.digitalpulsesoftware.net) -###Remerciements:### +###Remerciements: +---------- - **RafBill** et **Raakz:** Recherche de bugs et/ou tests - **Fissal "DrFisher" Hannoun**: Aide et conseils lors de la conception de l'architecture du moteur - **Alexandre "Danman" Janniaux**: Aide sur l'implémentation POSIX -- **Youri "Gawaboumga" Hubaut**: Amélioration du code via le merging sur GitHub +- **Youri "Gawaboumga" Hubaut**: Amélioration du moteur tant au niveau du code que de sa documentation et du projet en général.