@@ -174,7 +174,7 @@ endif()
174174
175175# Build the Bullet physics library
176176add_subdirectory ("${PROJECT_SOURCE_DIR } /lib/bullet" )
177- include_directories ("${PROJECT_SOURCE_DIR } /lib/bullet/src" )
177+ include_directories (BEFORE "${PROJECT_SOURCE_DIR } /lib/bullet/src" )
178178
179179if (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "BSD" )
180180 set (LIBRESOLV_LIBRARY)
@@ -198,7 +198,7 @@ if(ENET_FOUND AND NOT USE_IPV6)
198198else ()
199199 # Fallback to built-in version
200200 add_subdirectory ("${PROJECT_SOURCE_DIR } /lib/enet" )
201- include_directories ("${PROJECT_SOURCE_DIR } /lib/enet/include" )
201+ include_directories (BEFORE "${PROJECT_SOURCE_DIR } /lib/enet/include" )
202202 set (ENET_LIBRARIES "enet" )
203203endif ()
204204
@@ -208,7 +208,7 @@ if (APPLE AND NOT IOS)
208208 find_path (GLEW_INCLUDEDIR NAMES GL/glew.h glew.h PATHS )
209209 if (NOT GLEW_LIBRARY OR NOT GLEW_INCLUDEDIR)
210210 add_subdirectory ("${PROJECT_SOURCE_DIR } /lib/glew" )
211- include_directories ("${PROJECT_SOURCE_DIR } /lib/glew/include" )
211+ include_directories (BEFORE "${PROJECT_SOURCE_DIR } /lib/glew/include" )
212212 set (GLEW_LIBRARIES "glew" )
213213 else ()
214214 set (GLEW_LIBRARIES ${GLEW_LIBRARY} )
@@ -226,7 +226,7 @@ elseif(NOT USE_GLES2 AND NOT SERVER_ONLY)
226226 else ()
227227 # Fallback to built-in version silently
228228 add_subdirectory ("${PROJECT_SOURCE_DIR } /lib/glew" )
229- include_directories ("${PROJECT_SOURCE_DIR } /lib/glew/include" )
229+ include_directories (BEFORE "${PROJECT_SOURCE_DIR } /lib/glew/include" )
230230 set (GLEW_LIBRARIES "glew" )
231231 endif ()
232232endif ()
@@ -260,17 +260,17 @@ endif()
260260
261261if (NOT SERVER_ONLY)
262262 add_subdirectory ("${PROJECT_SOURCE_DIR } /lib/graphics_utils" )
263- include_directories ("${PROJECT_SOURCE_DIR } /lib/graphics_utils" )
263+ include_directories (BEFORE "${PROJECT_SOURCE_DIR } /lib/graphics_utils" )
264264 add_subdirectory ("${PROJECT_SOURCE_DIR } /lib/tinygettext" )
265- include_directories ("${PROJECT_SOURCE_DIR } /lib/tinygettext/include" )
265+ include_directories (BEFORE "${PROJECT_SOURCE_DIR } /lib/tinygettext/include" )
266266endif ()
267267
268268# Libmcpp
269269find_library (MCPP_LIBRARY NAMES mcpp libmcpp )
270270find_path (MCPP_INCLUDEDIR NAMES mcpp_lib.h PATHS )
271271if (NOT MCPP_LIBRARY OR NOT MCPP_INCLUDEDIR)
272272 add_subdirectory ("${PROJECT_SOURCE_DIR } /lib/mcpp" )
273- include_directories ("${PROJECT_SOURCE_DIR } /lib/mcpp" )
273+ include_directories (BEFORE "${PROJECT_SOURCE_DIR } /lib/mcpp" )
274274 SET (MCPP_LIBRARY mcpp)
275275 message (STATUS "System libmcpp not found, use the bundled one." )
276276else ()
@@ -285,7 +285,7 @@ if(NOT SERVER_ONLY)
285285 endif ()
286286 if (NOT SQUISH_LIBRARY OR NOT SQUISH_INCLUDEDIR)
287287 add_subdirectory ("${PROJECT_SOURCE_DIR } /lib/libsquish" )
288- include_directories ("${PROJECT_SOURCE_DIR } /lib/libsquish" )
288+ include_directories (BEFORE "${PROJECT_SOURCE_DIR } /lib/libsquish" )
289289 SET (SQUISH_LIBRARY squish)
290290 else ()
291291 include_directories ("${SQUISH_INCLUDEDIR} " )
@@ -308,7 +308,7 @@ endif()
308308
309309# Build the irrlicht library
310310add_subdirectory ("${PROJECT_SOURCE_DIR } /lib/irrlicht" )
311- include_directories ("${PROJECT_SOURCE_DIR } /lib/irrlicht/include" )
311+ include_directories (BEFORE "${PROJECT_SOURCE_DIR } /lib/irrlicht/include" )
312312
313313# Build the Wiiuse library
314314# Note: wiiuse MUST be declared after irrlicht, since otherwise
@@ -327,7 +327,7 @@ if(USE_WIIUSE)
327327 if (WIIUSE_BUILD)
328328 add_subdirectory ("${PROJECT_SOURCE_DIR } /lib/wiiuse" )
329329 endif ()
330- include_directories ("${PROJECT_SOURCE_DIR } /lib/wiiuse/src" )
330+ include_directories (BEFORE "${PROJECT_SOURCE_DIR } /lib/wiiuse/src" )
331331 set (WIIUSE_LIBRARIES "wiiuse" "bluetooth" )
332332 endif ()
333333endif ()
@@ -375,7 +375,7 @@ endif()
375375if (NOT SERVER_ONLY)
376376 # SheenBidi
377377 add_subdirectory ("${PROJECT_SOURCE_DIR } /lib/sheenbidi" )
378- include_directories ("${PROJECT_SOURCE_DIR } /lib/sheenbidi/Headers" )
378+ include_directories (BEFORE "${PROJECT_SOURCE_DIR } /lib/sheenbidi/Headers" )
379379 SET (SHEENBIDI_LIBRARY sheenbidi)
380380
381381 # Freetype
@@ -422,7 +422,7 @@ if(USE_SQLITE3)
422422 find_path (SQLITE3_INCLUDEDIR NAMES sqlite3.h PATHS )
423423 if (NOT SQLITE3_LIBRARY OR NOT SQLITE3_INCLUDEDIR)
424424# add_subdirectory("${PROJECT_SOURCE_DIR}/lib/sqlite3")
425- # include_directories("${PROJECT_SOURCE_DIR}/lib/sqlite3")
425+ # include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/sqlite3")
426426# SET(SQLITE3_LIBRARY sqlite3)
427427 set (USE_SQLITE3 OFF CACHE BOOL "Use sqlite to manage server stats and ban list." FORCE )
428428 message (WARNING "Sqlite3 not found, disable advanced server management." )
0 commit comments