|
|
@@ -73,7 +73,7 @@ glfw_dep = glfw_proj.dependency('glfw')
|
|
|
|
|
|
glew_proj = subproject('glew', default_options: 'default_library=static')
|
|
|
glew_includes = glew_proj.get_variable('glew_include')
|
|
|
-glew_dep = dependency('glew')
|
|
|
+glew_dep = glew_proj.get_variable('glew_dep')
|
|
|
|
|
|
thread_dep = dependency('threads', static: true)
|
|
|
gl_dep = dependency('GL')
|
|
|
@@ -83,18 +83,18 @@ winmm_dep = compiler.find_library('winmm', required: false)
|
|
|
glu_dep = compiler.find_library('glu32', required: false)
|
|
|
dl_dep = compiler.find_library('dl', required: false)
|
|
|
|
|
|
-libgamingcore_include = ['.', glfw_includes, glew_includes]
|
|
|
+gamingcore_include = [include_directories('.'), glfw_includes, glew_includes]
|
|
|
|
|
|
-libgamingcore = static_library('gamingcore',
|
|
|
+gamingcore = static_library('gamingcore',
|
|
|
sources: src,
|
|
|
- include_directories : libgamingcore_include,
|
|
|
+ include_directories : gamingcore_include,
|
|
|
dependencies : [thread_dep, glfw_dep, glew_dep, gl_dep, ws2_32_dep, winmm_dep, glu_dep, dl_dep, glu_dep],
|
|
|
cpp_args: args)
|
|
|
-libgamingcore_dep = declare_dependency(
|
|
|
- include_directories : libgamingcore_include,
|
|
|
- link_with: libgamingcore)
|
|
|
+gamingcore_dep = declare_dependency(
|
|
|
+ include_directories : gamingcore_include,
|
|
|
+ link_with: gamingcore)
|
|
|
|
|
|
executable('tests',
|
|
|
sources: src_tests,
|
|
|
- dependencies : libgamingcore_dep,
|
|
|
+ dependencies : gamingcore_dep,
|
|
|
cpp_args: args + ['-DLOG_LEVEL=4'])
|
Kajetan Johannes Hammerle