Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modified pegged version #12

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build-angle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Build angle

on:
push:
branches:
- master
paths:
- .github/workflows/build-angle.yml
workflow_dispatch:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Build deps

on:
push:
branches:
- master
paths:
- .github/workflows/build-deps.yml
workflow_dispatch:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: CI

on:
push:
branches:
- master
paths:
- dub.json
- 'utils/**'
Expand Down Expand Up @@ -87,7 +89,7 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: anothrNick/github-tag-action@1.26.0
- uses: anothrNick/github-tag-action@v1
id: create_tag
env:
WITH_V: true
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/source/perfontain/opengl/functions.d

/libs/
*.html

/utils/gui/gen*
/utils/opengl/gen*
Expand Down
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"files.associations": {
"*.inc": "cpp"
}
}
17 changes: 9 additions & 8 deletions dub.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
}
},
"dependencies": {
"stb": ">=2.0.1",
"utile": ">=1.2.8",
"pegged": ">=0.4.5-beta.2",
"derelict-sdl2": ">=3.1.0-alpha.4"
"stb": {"path":"external_libs/stb/stb/"},
"utile": {"path":"external_libs/utile/utile/"},
"pegged": ">=0.4.5",
"derelict-sdl2": {"path":"external_libs/derelict-sdl2/derelict-sdl2/"}
},
"subConfigurations": {
"derelict-sdl2": "derelict-sdl2-static"
Expand Down Expand Up @@ -57,12 +57,13 @@
"-Lutils/deps"
],
"lflags-windows": [
"/LIBPATH:utils/deps"
"/LIBPATH:utils/deps","/NODEFAULTLIB:libcmt.lib","/NODEFAULTLIB:libcmtd.lib","/NODEFAULTLIB:msvcrtd.lib"
],
"lflags-windows-dmd": [
"/LIBPATH:utils/deps/debug"
"/LIBPATH:utils/deps/debug","/NODEFAULTLIB:libcmt.lib","/NODEFAULTLIB:libcmtd.lib","/NODEFAULTLIB:msvcrtd.lib"
],
"lflags-windows-ldc": [
"/LIBPATH:utils/deps/release"
]
"/LIBPATH:utils/deps/release","/NODEFAULTLIB:libvcruntime"
],
"buildRequirements": ["silenceWarnings"]
}
Empty file.
11 changes: 11 additions & 0 deletions external_libs/derelict-sdl2/derelict-sdl2/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
language: d

sudo: false

d:
- dmd
- dmd-2.073.2
- dmd-2.072.2
- dmd-2.071.2
- ldc
- gdc
54 changes: 54 additions & 0 deletions external_libs/derelict-sdl2/derelict-sdl2/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
DerelictSDL2
============

**NOTE**: DerelictSDL2 is in bugfix-only mode. It has been superseded by [the bindbc-sdl package][9]. DerelictSDL2 will be available through the dub repository for as long as old projects depend upon it, but [new projects should use bindbc-sdl][9].

Dynamic bindings to [SDL 2][1] versions 2.0.0 - 2.0.6, [SDL2_image][2], [SDL2_mixer][3], [SDL2_ttf][4], and [SDL2_net][5] for the D Programming Language.

Please see the [DerelictSDL2 documentation][6] and the sections on [Compiling and Linking][7] and [The Derelict Loader][8], in the Derelict documentation, for information on how to build DerelictSDL2 and load the SDL2 libraries at run time. In the meantime, here's some sample code.

```D
// This example shows how to import all of the DerelictSDL2 bindings. Of course,
// you only need to import the modules that correspond to the libraries you
// actually need to load.
import derelict.sdl2.sdl;
import derelict.sdl2.image;
import derelict.sdl2.mixer;
import derelict.sdl2.ttf;
import derelict.sdl2.net;

void main() {
// This example shows how to load all of the SDL2 libraries. You only need
// to call the load methods for those libraries you actually need to load.

// Load the SDL 2 library.
DerelictSDL2.load();

// Load the SDL2_image library.
DerelictSDL2Image.load();

// Load the SDL2_mixer library.
DerelictSDL2Mixer.load();

// Load the SDL2_ttf library
DerelictSDL2ttf.load();

// Load the SDL2_net library.
DerelictSDL2Net.load();

// Now SDL 2 functions for all of the SDL2 libraries can be called.
...
}
```

[1]: http://www.libsdl.org/download-2.0.php
[2]: http://www.libsdl.org/projects/SDL_image/
[3]: http://www.libsdl.org/projects/SDL_mixer/
[4]: http://www.libsdl.org/projects/SDL_ttf/
[5]: http://www.libsdl.org/projects/SDL_net/
[6]: http://derelictorg.github.io/packages/sdl2/
[7]: http://derelictorg.github.io/building/overview/
[8]: http://derelictorg.github.io/loading/loader/
[9]: https://github.com/BindBC/bindbc-sdl


40 changes: 40 additions & 0 deletions external_libs/derelict-sdl2/derelict-sdl2/dub.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"authors": [
"Mike Parker"
],
"configurations": [
{
"excludedSourceFiles": [
"source/derelict/sdl2/internal/*_static.d"
],
"name": "derelict-sdl2-dynamic",
"targetType": "library"
},
{
"excludedSourceFiles": [
"source/derelict/sdl2/internal/*_dyn*.d"
],
"name": "derelict-sdl2-static",
"targetType": "library",
"versions": [
"DerelictSDL2_Static"
]
}
],
"dependencies": {
"derelict-util": ">=3.0.0-beta.1 <3.1.0-0"
},
"description": "Dynamic bindings to SDL2, SDL2_image, SDL2_mixer, SDL2_ttf and SDL2_net.",
"homepage": "https://github.com/DerelictOrg/DerelictSDL2",
"importPaths": [
"source/"
],
"license": "Boost",
"name": "derelict-sdl2",
"sourcePaths": [
"source/"
],
"targetName": "DerelictSDL2",
"targetPath": "lib",
"version": "3.1.0-alpha.6"
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*

Boost Software License - Version 1.0 - August 17th,2003

Permission is hereby granted,free of charge,to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use,reproduce,display,distribute,
execute,and transmit the Software,and to prepare derivative works of the
Software,and to permit third-parties to whom the Software is furnished to
do so,all subject to the following:

The copyright notices in the Software and this entire statement,including
the above license grant,this restriction and the following disclaimer,
must be included in all copies of the Software,in whole or in part,and
all derivative works of the Software,unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.

THE SOFTWARE IS PROVIDED "AS IS",WITHOUT WARRANTY OF ANY KIND,EXPRESS OR
IMPLIED,INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE,TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY,WHETHER IN CONTRACT,TORT OR OTHERWISE,
ARISING FROM,OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

*/
module derelict.sdl2.config;

version(Derelict_Static) version = DerelictSDL2_Static;

version(DerelictSDL2_Static) {
version = DerelictSDL2Core_Static;
version = DerelictSDL2GPU_Static;
version = DerelictSDL2Image_Static;
version = DerelictSDL2Mixer_Static;
version = DerelictSDL2Net_Static;
version = DerelictSDL2TTF_Static;
}

version(DerelictSDL2Core_Static)
enum staticSDL = true;
else enum staticSDL = false;

version(DerelictSDL2GPU_Static)
enum staticGPU = true;
else enum staticGPU = false;

version(DerelictSDL2Image_Static)
enum staticImage = true;
else enum staticImage = false;


version(DerelictSDL2Mixer_Static)
enum staticMixer = true;
else enum staticMixer = false;


version(DerelictSDL2Net_Static)
enum staticNet = true;
else enum staticNet = false;


version(DerelictSDL2TTF_Static)
enum staticTTF = true;
else enum staticTTF = false;
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*

Boost Software License - Version 1.0 - August 17th,2003

Permission is hereby granted,free of charge,to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license(the "Software") to use,reproduce,display,distribute,
execute,and transmit the Software,and to prepare derivative works of the
Software,and to permit third-parties to whom the Software is furnished to
do so,all subject to the following:

The copyright notices in the Software and this entire statement,including
the above license grant,this restriction and the following disclaimer,
must be included in all copies of the Software,in whole or in part,and
all derivative works of the Software,unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.

THE SOFTWARE IS PROVIDED "AS IS",WITHOUT WARRANTY OF ANY KIND,EXPRESS OR
IMPLIED,INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE,TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY,WHETHER IN CONTRACT,TORT OR OTHERWISE,
ARISING FROM,OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

*/
module derelict.sdl2.gpu;

import derelict.sdl2.config;

public:
import derelict.sdl2.internal.gpu_types;
static if(staticGPU)
import derelict.sdl2.internal.gpu_static;
else
import derelict.sdl2.internal.gpu_dynload;
Loading