Skip to content

Commit 418bb4a

Browse files
committed
submodules
1 parent e1fd677 commit 418bb4a

File tree

7 files changed

+43
-68
lines changed

7 files changed

+43
-68
lines changed

.gitmodules

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1 @@
1-
[submodule "WebAssemblyDemo/Vendor/assimp"]
2-
path = WebAssemblyDemo/Vendor/assimp
3-
url = https://github.com/assimp/assimp.git
4-
branch = master
5-
[submodule "WebAssemblyDemo/Vendor/glad"]
6-
path = WebAssemblyDemo/Vendor/glad
7-
url = https://github.com/Dav1dde/glad.git
8-
branch = c
9-
[submodule "WebAssemblyDemo/Vendor/glfw"]
10-
path = WebAssemblyDemo/Vendor/glfw
11-
url = https://github.com/glfw/glfw.git
12-
branch = master
13-
[submodule "WebAssemblyDemo/Vendor/glm"]
14-
path = WebAssemblyDemo/Vendor/glm
15-
url = https://github.com/g-truc/glm.git
16-
branch = master
17-
[submodule "WebAssemblyDemo/Vendor/stb"]
18-
path = WebAssemblyDemo/Vendor/stb
19-
url = https://github.com/nothings/stb.git
20-
branch = master
21-
[submodule "WebAssemblyDemo/Vendor/bullet"]
22-
path = WebAssemblyDemo/Vendor/bullet
23-
url = https://github.com/bulletphysics/bullet3.git
24-
branch = master
1+

WebAssemblyDemo/Vendor/assimp

Lines changed: 0 additions & 1 deletion
This file was deleted.

WebAssemblyDemo/Vendor/glad

Lines changed: 0 additions & 1 deletion
This file was deleted.

WebAssemblyDemo/Vendor/glfw

Lines changed: 0 additions & 1 deletion
This file was deleted.

WebAssemblyDemo/Vendor/glm

Lines changed: 0 additions & 1 deletion
This file was deleted.

WebAssemblyDemo/Vendor/stb

Lines changed: 0 additions & 1 deletion
This file was deleted.

webpack.config.js

Lines changed: 42 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,44 +14,47 @@ const entrypoint = process.env.npm_lifecycle_event === 'dev' ?
1414
'webpack-dev-server/client?http://localhost:8080' :
1515
'./app/index.js';
1616

17-
module.exports = {
18-
devtool: 'source-map',
19-
entry: entrypoint,
20-
output: {
21-
path: __dirname + '/dist',
22-
filename: 'bundle.js'
23-
},
24-
module: {
25-
loaders: [
26-
{
27-
test: /\.js$/,
28-
include: __dirname + '/app',
29-
loader: 'babel-loader',
30-
query: {
31-
presets: ['es2015', 'stage-0']
17+
module.exports = function (env) {
18+
19+
return {
20+
devtool: env === 'production' ? false : 'source-map',
21+
entry: entrypoint,
22+
output: {
23+
path: __dirname + '/dist',
24+
filename: 'bundle.js'
25+
},
26+
module: {
27+
loaders: [
28+
{
29+
test: /\.js$/,
30+
include: __dirname + '/app',
31+
loader: 'babel-loader',
32+
query: {
33+
presets: ['es2015', 'stage-0']
34+
}
35+
},
36+
{
37+
test: /\.scss$/,
38+
include: __dirname + '/app',
39+
loader: ExtractTextPlugin.extract('css-loader!sass-loader')
40+
},
41+
{
42+
test: /\.wasm$/,
43+
loaders: ['wasm-loader']
3244
}
33-
},
34-
{
35-
test: /\.scss$/,
36-
include: __dirname + '/app',
37-
loader: ExtractTextPlugin.extract('css-loader!sass-loader')
38-
},
39-
{
40-
test: /\.wasm$/,
41-
loaders: ['wasm-loader']
42-
}
43-
]
44-
},
45-
plugins: [
46-
HtmlWebpackPluginConfig,
47-
ExtractTextPluginConfig,
48-
// Need to copy some wasm files as we import the JS file from the emcc MODULARIZE setting
49-
new CopyWebpackPlugin([{
50-
from: 'build/*.wasm',
51-
to: 'wasm/[name].wasm'
52-
}])
53-
],
54-
node: {
55-
fs: 'empty'
45+
]
46+
},
47+
plugins: [
48+
HtmlWebpackPluginConfig,
49+
ExtractTextPluginConfig,
50+
// Need to copy some wasm files as we import the JS file from the emcc MODULARIZE setting
51+
new CopyWebpackPlugin([{
52+
from: 'build/*.wasm',
53+
to: 'wasm/[name].wasm'
54+
}])
55+
],
56+
node: {
57+
fs: 'empty'
58+
}
5659
}
57-
};
60+
}

0 commit comments

Comments
 (0)