Skip to content

Commit 9709bbb

Browse files
committed
UPBGE: More fixes for linux compiling
Recast Navigation issues are gone now. Absorb some changes from @youle31 branch. At this moment I want to see possible solutions. At end i will mix commits from both branches.
1 parent 7cb4763 commit 9709bbb

File tree

12 files changed

+490
-16
lines changed

12 files changed

+490
-16
lines changed

extern/recastnavigation/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,7 @@ set(SRC
6969
Recast/Include/RecastAssert.h
7070
)
7171

72+
set(LIB
73+
)
74+
7275
blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/blenkernel/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -591,14 +591,6 @@ if(WITH_LZMA)
591591
endif()
592592

593593
if(WITH_GAMEENGINE)
594-
list(APPEND INC_SYS
595-
../../../extern/recastnavigation
596-
)
597-
list(APPEND SRC
598-
intern/navmesh_conversion.c
599-
BKE_navmesh_conversion.h
600-
)
601-
602594
add_definitions(-DWITH_GAMEENGINE)
603595
endif()
604596

source/blenderplayer/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
setup_libdirs()
2929

3030

31+
if(WITH_PLAYER)
32+
add_subdirectory(bad_level_call_stubs)
33+
endif()
34+
3135
list(APPEND LIB
3236
ge_player
3337
blenkernel_blc
@@ -93,8 +97,4 @@ add_dependencies(blenderplayer makesdna)
9397
target_link_libraries(blenderplayer ${LIB})
9498
unset(LIB)
9599

96-
if(WITH_PLAYER)
97-
add_subdirectory(bad_level_call_stubs)
98-
endif()
99-
100100
setup_liblinks(blenderplayer)

source/gameengine/BlenderRoutines/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ set(SRC
4848
set(LIB
4949
ge_ketsji
5050
ge_common
51+
ge_launcher
5152
)
5253

5354
add_definitions(${GL_DEFINITIONS})

source/gameengine/Converter/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ set(SRC
105105
set(LIB
106106
ge_physics_dummy
107107
ge_physics_bullet
108+
ge_ketsji
109+
ge_rasterizer
110+
108111
)
109112

110113
if(WITH_BULLET)

source/gameengine/Converter/KX_IpoConvert.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,13 +444,13 @@ SG_Controller *BL_CreateMaterialIpo(
444444
ipocontr->m_rgba[0] = blendermaterial->r;
445445
ipocontr->m_rgba[1] = blendermaterial->g;
446446
ipocontr->m_rgba[2] = blendermaterial->b;
447-
ipocontr->m_rgba[3] = blendermaterial->alpha;
447+
ipocontr->m_rgba[3] = 1.0f;//blendermaterial->alpha;
448448

449449
ipocontr->m_specrgb[0] = blendermaterial->specr;
450450
ipocontr->m_specrgb[1] = blendermaterial->specg;
451451
ipocontr->m_specrgb[2] = blendermaterial->specb;
452452
ipocontr->m_spec = blendermaterial->spec;
453-
ipocontr->m_alpha = blendermaterial->alpha;
453+
ipocontr->m_alpha = 1.0f;//blendermaterial->alpha;
454454
}
455455

456456
return ipocontr;

source/gameengine/GameLogic/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ set(SRC
175175
)
176176

177177
set(LIB
178+
ge_expressions
178179
)
179180

180181
if(WITH_AUDASPACE)

source/gameengine/Ketsji/CMakeLists.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,14 @@ set(SRC
180180
)
181181

182182
set(LIB
183-
ge_rasterizer
184183
ge_converter
184+
ge_logic_bricks
185+
ge_scenegraph
186+
ge_msg_network
187+
ge_device
188+
extern_recastnavigation
189+
bf_blenkernel
190+
ge_rasterizer
185191
)
186192

187193
add_definitions(${GL_DEFINITIONS})
@@ -211,4 +217,8 @@ if(WITH_BULLET)
211217
add_definitions(-DWITH_BULLET)
212218
endif()
213219

220+
if(WITH_GAMEENGINE)
221+
add_definitions(-DWITH_GAMEENGINE)
222+
endif()
223+
214224
blender_add_lib(ge_ketsji "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

0 commit comments

Comments
 (0)