Build is working on both OSX and Windows. Now for linux.
This commit is contained in:
parent
e1f9942da3
commit
b7948f8154
6 changed files with 6 additions and 6 deletions
Binary file not shown.
Before Width: | Height: | Size: 107 KiB After Width: | Height: | Size: 38 KiB |
|
@ -54,7 +54,7 @@
|
||||||
"tunnel_with_rocks_stage": "assets/tunnel_with_rocks_stage.png"
|
"tunnel_with_rocks_stage": "assets/tunnel_with_rocks_stage.png"
|
||||||
},
|
},
|
||||||
"worldgen": {
|
"worldgen": {
|
||||||
"enemy_probability": 80,
|
"enemy_probability": 30,
|
||||||
"empty_room_probability": 10,
|
"empty_room_probability": 10,
|
||||||
"device_probability": 10
|
"device_probability": 10
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 316 KiB After Width: | Height: | Size: 80 KiB |
Binary file not shown.
Before Width: | Height: | Size: 109 KiB After Width: | Height: | Size: 52 KiB |
10
meson.build
10
meson.build
|
@ -15,11 +15,6 @@ cc = meson.get_compiler('cpp')
|
||||||
dependencies = []
|
dependencies = []
|
||||||
|
|
||||||
if build_machine.system() == 'windows'
|
if build_machine.system() == 'windows'
|
||||||
sfml_main = dependency('sfml_main')
|
|
||||||
opengl32 = cc.find_library('opengl32', required: true)
|
|
||||||
winmm = cc.find_library('winmm', required: true)
|
|
||||||
gdi32 = cc.find_library('gdi32', required: true)
|
|
||||||
|
|
||||||
add_global_link_arguments(
|
add_global_link_arguments(
|
||||||
'-static-libgcc',
|
'-static-libgcc',
|
||||||
'-static-libstdc++',
|
'-static-libstdc++',
|
||||||
|
@ -27,6 +22,11 @@ if build_machine.system() == 'windows'
|
||||||
language: 'cpp',
|
language: 'cpp',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
sfml_main = dependency('sfml_main')
|
||||||
|
opengl32 = cc.find_library('opengl32', required: true)
|
||||||
|
winmm = cc.find_library('winmm', required: true)
|
||||||
|
gdi32 = cc.find_library('gdi32', required: true)
|
||||||
|
|
||||||
dependencies += [
|
dependencies += [
|
||||||
opengl32, winmm, gdi32, sfml_main
|
opengl32, winmm, gdi32, sfml_main
|
||||||
]
|
]
|
||||||
|
|
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue