Skip to content

Commit d18fd46

Browse files
committed
updated lwjgl, fixed the problem with ordering dialogs.
1 parent e233ba3 commit d18fd46

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+124
-23
lines changed

app.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v.0.9.9
1+
0.9.10

build-native.xml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<target name="setup-staging-area">
2222
<delete dir="externalLibs"/>
2323
<delete dir="project"/>
24+
<delete dir="licenses"/>
2425
<delete dir="projectRefs"/>
2526

2627
<mkdir dir="externalLibs"/>
@@ -69,10 +70,15 @@
6970
</copy>
7071

7172
<mkdir dir="licenses"/>
73+
<mkdir dir="licenses/libraries-licenses"/>
7274
<copy todir="licenses">
7375
<fileset dir="../" >
74-
<include name="*license*"/>
75-
<include name="*LICENSE*"/>
76+
<include name="LICENSE"/>
77+
</fileset>
78+
</copy>
79+
<copy todir="licenses/libraries-licenses">
80+
<fileset dir="../libraries-licenses" >
81+
<include name="*"/>
7682
</fileset>
7783
</copy>
7884

@@ -158,6 +164,12 @@
158164
</fileset>
159165
</copy>
160166

167+
<copy todir="dist/licenses/libraries-licenses">
168+
<fileset dir="licenses/libraries-licenses" >
169+
<include name="*"/>
170+
</fileset>
171+
</copy>
172+
161173
<copy todir="dist/libs">
162174
<fileset dir="externalLibs">
163175
<include name="*"/>
@@ -209,6 +221,7 @@
209221
<fx:resources id="appRes">
210222
<fx:fileset dir="dist" includes="jme3-spaceshift-editor.jar"/>
211223
<fx:fileset dir="dist" includes="licenses/*"/>
224+
<fx:fileset dir="dist" includes="licenses/libraries-licenses/*"/>
212225
<fx:fileset dir="dist" includes="libs/*"/>
213226
<fx:fileset dir="dist" includes="libs/jME/*"/>
214227
<fx:fileset dir="dist" includes="libs/svg/*"/>

build/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/dist/
55
/deploy/
66
/build/
7+
/licenses/

libraries-licenses/LICENSE

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Copyright (c) 2012-present Lightweight Java Game Library
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are
6+
met:
7+
8+
- Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
11+
- Redistributions in binary form must reproduce the above copyright
12+
notice, this list of conditions and the following disclaimer in the
13+
documentation and/or other materials provided with the distribution.
14+
15+
- Neither the name Lightweight Java Game Library nor the names of
16+
its contributors may be used to endorse or promote products derived
17+
from this software without specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21+
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
23+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
24+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
25+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
26+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
27+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
28+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
29+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)