Former-commit-id: 4cb675e0bbc35ccf3bd34f47749a01258e263f3a [formerly d4c7b62197b02c2b7353c85ae41788b1b17af315] [formerly 43ec97ab70568fd11b6b422fea17ef7c6cd84fd2 [formerly 7370de6e2e8cd39d350fdba299c43c0aec8c668e]]
Former-commit-id: 67728e7bda47ca6470821e455c802e27e6f9e3bf [formerly 93dc4cc646aff434875fab140f8df0fca8bde4a7]
Former-commit-id: 3d722a3d7b0e3e4cf70a02d4fdc38aea380cbd71
This commit is contained in:
Lynix 2016-09-22 18:18:03 +02:00
commit dedd583bf5
5 changed files with 75 additions and 25 deletions

25
.travis.yml Normal file
View File

@ -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

11
Dockerfile Normal file
View File

@ -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

View File

@ -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+))");

View File

@ -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 (<lynix680@gmail.com>)
Rémi "overdrivr" Bèges - developper & helper - Noise Module - (<remi.beges@laposte.net>)
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.

View File

@ -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 (<lynix680@gmail.com>)
Rémi "overdrivr" Bèges - développeur & aide - module Noise - (<remi.beges@laposte.net>)
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.