Skip to content

Commit 2a96699

Browse files
LiruMouseLiruMouse
committed
Oh gawd more sync and stuff to fix linker errors & non(windows|release) builds!
Also I fixed all the CMake warnings~
1 parent ad66e1c commit 2a96699

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1660
-479
lines changed

‎indra/cmake/00-Common.cmake‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
77

88
include(Variables)
99

10-
1110
# Portable compilation flags.
12-
1311
set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
1412
set(CMAKE_CXX_FLAGS_RELEASE
1513
"-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DNDEBUG")
@@ -31,12 +29,11 @@ if(NON_RELEASE_CRASH_REPORTING)
3129
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DLL_SEND_CRASH_REPORTS=1")
3230
endif()
3331

34-
3532
# Don't bother with a MinSizeRel build.
36-
3733
set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
3834
"Supported build types." FORCE)
3935

36+
4037
# Platform-specific compilation flags.
4138

4239
if (WINDOWS)

‎indra/cmake/Boost.cmake‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,78 +7,90 @@ set(Boost_FIND_REQUIRED ON)
77
if (STANDALONE)
88
include(FindBoost)
99

10-
set(Boost_USE_MULTITHREADED ON)
11-
find_package(Boost 1.51.0 COMPONENTS date_time filesystem program_options regex system thread wave context)
10+
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
11+
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
12+
set(BOOST_REGEX_LIBRARY boost_regex-mt)
13+
set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
1214
else (STANDALONE)
1315
use_prebuilt_binary(boost)
1416
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
15-
set(Boost_VERSION "1.60")
17+
set(BOOST_VERSION "1.60")
1618

1719
if (WINDOWS)
18-
set(Boost_CONTEXT_LIBRARY
20+
set(BOOST_CHRONO_LIBRARY
21+
optimized libboost_chrono-mt
22+
debug libboost_chrono-mt-gd)
23+
set(BOOST_CONTEXT_LIBRARY
1924
optimized libboost_context-mt
2025
debug libboost_context-mt-gd)
21-
set(Boost_FILESYSTEM_LIBRARY
26+
set(BOOST_FILESYSTEM_LIBRARY
2227
optimized libboost_filesystem-mt
2328
debug libboost_filesystem-mt-gd)
24-
set(Boost_PROGRAM_OPTIONS_LIBRARY
29+
set(BOOST_PROGRAM_OPTIONS_LIBRARY
2530
optimized libboost_program_options-mt
2631
debug libboost_program_options-mt-gd)
27-
set(Boost_REGEX_LIBRARY
32+
set(BOOST_REGEX_LIBRARY
2833
optimized libboost_regex-mt
2934
debug libboost_regex-mt-gd)
30-
set(Boost_SIGNALS_LIBRARY
35+
set(BOOST_SIGNALS_LIBRARY
3136
optimized libboost_signals-mt
3237
debug libboost_signals-mt-gd)
33-
set(Boost_SYSTEM_LIBRARY
38+
set(BOOST_SYSTEM_LIBRARY
3439
optimized libboost_system-mt
3540
debug libboost_system-mt-gd)
36-
set(Boost_THREAD_LIBRARY
41+
set(BOOST_THREAD_LIBRARY
3742
optimized libboost_thread-mt
3843
debug libboost_thread-mt-gd)
3944
elseif (LINUX)
40-
set(Boost_CONTEXT_LIBRARY
45+
set(BOOST_CHRONO_LIBRARY
46+
optimized boost_chrono-mt
47+
debug boost_chrono-mt-d)
48+
set(BOOST_CONTEXT_LIBRARY
4149
optimized boost_context-mt
4250
debug boost_context-mt-d)
43-
set(Boost_FILESYSTEM_LIBRARY
51+
set(BOOST_FILESYSTEM_LIBRARY
4452
optimized boost_filesystem-mt
4553
debug boost_filesystem-mt-d)
46-
set(Boost_PROGRAM_OPTIONS_LIBRARY
54+
set(BOOST_PROGRAM_OPTIONS_LIBRARY
4755
optimized boost_program_options-mt
4856
debug boost_program_options-mt-d)
49-
set(Boost_REGEX_LIBRARY
57+
set(BOOST_REGEX_LIBRARY
5058
optimized boost_regex-mt
5159
debug boost_regex-mt-d)
52-
set(Boost_SIGNALS_LIBRARY
60+
set(BOOST_SIGNALS_LIBRARY
5361
optimized boost_signals-mt
5462
debug boost_signals-mt-d)
55-
set(Boost_SYSTEM_LIBRARY
63+
set(BOOST_SYSTEM_LIBRARY
5664
optimized boost_system-mt
5765
debug boost_system-mt-d)
58-
set(Boost_THREAD_LIBRARY
66+
set(BOOST_THREAD_LIBRARY
5967
optimized boost_thread-mt
6068
debug boost_thread-mt-d)
6169
elseif (DARWIN)
62-
set(Boost_CONTEXT_LIBRARY
70+
set(BOOST_CHRONO_LIBRARY
71+
optimized boost_chrono-mt
72+
debug boost_chrono-mt-d)
73+
set(BOOST_CONTEXT_LIBRARY
6374
optimized boost_context-mt
6475
debug boost_context-mt-d)
65-
set(Boost_FILESYSTEM_LIBRARY
76+
set(BOOST_FILESYSTEM_LIBRARY
6677
optimized boost_filesystem-mt
6778
debug boost_filesystem-mt-d)
68-
set(Boost_PROGRAM_OPTIONS_LIBRARY
79+
set(BOOST_PROGRAM_OPTIONS_LIBRARY
6980
optimized boost_program_options-mt
7081
debug boost_program_options-mt-d)
71-
set(Boost_REGEX_LIBRARY
82+
set(BOOST_REGEX_LIBRARY
7283
optimized boost_regex-mt
7384
debug boost_regex-mt-d)
74-
set(Boost_SIGNALS_LIBRARY
85+
set(BOOST_SIGNALS_LIBRARY
7586
optimized boost_signals-mt
7687
debug boost_signals-mt-d)
77-
set(Boost_SYSTEM_LIBRARY
88+
set(BOOST_SYSTEM_LIBRARY
7889
optimized boost_system-mt
7990
debug boost_system-mt-d)
80-
set(Boost_THREAD_LIBRARY
91+
set(BOOST_THREAD_LIBRARY
8192
optimized boost_thread-mt
8293
debug boost_thread-mt-d)
8394
endif (WINDOWS)
8495
endif (STANDALONE)
96+

‎indra/cmake/CARes.cmake‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎indra/cmake/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,19 @@ set(cmake_SOURCE_FILES
1212
Audio.cmake
1313
Boost.cmake
1414
BuildVersion.cmake
15-
CARes.cmake
1615
CEFPlugin.cmake
1716
CMakeCopyIfDifferent.cmake
1817
CURL.cmake
1918
Colladadom.cmake
2019
ConfigurePkgConfig.cmake
2120
Copy3rdPartyLibs.cmake
22-
Cwdebug.cmake
2321
DBusGlib.cmake
2422
DeploySharedLibs.cmake
2523
EXPAT.cmake
2624
ExamplePlugin.cmake
2725
FMODSTUDIO.cmake
2826
FindAPR.cmake
2927
FindAutobuild.cmake
30-
FindCARes.cmake
3128
FindColladadom.cmake
3229
FindGLOD.cmake
3330
FindGoogleBreakpad.cmake

‎indra/cmake/Cwdebug.cmake‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎indra/cmake/FindCARes.cmake‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎indra/cmake/LLAddBuildTest.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
INCLUDE(APR)
44
INCLUDE(LLMath)
55
INCLUDE(Tut)
6-
INCLUDE(Cwdebug)
76

87
MACRO(ADD_BUILD_TEST_NO_COMMON name parent)
98
# MESSAGE("${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")

‎indra/cmake/LLAppearance.cmake‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
# -*- cmake -*-
22

33
include(Variables)
4+
include(Boost)
5+
include(LLMessage)
6+
include(LLCoreHttp)
47

58
set(LLAPPEARANCE_INCLUDE_DIRS
69
${LIBS_OPEN_DIR}/llappearance
710
)
811

9-
set(LLAPPEARANCE_LIBRARIES llappearance)
12+
if (BUILD_HEADLESS)
13+
set(LLAPPEARANCE_HEADLESS_LIBRARIES
14+
llappearanceheadless
15+
)
16+
endif (BUILD_HEADLESS)
17+
18+
set(LLAPPEARANCE_LIBRARIES llappearance
19+
llmessage
20+
llcorehttp
21+
)
22+
1023

1124

‎indra/cmake/LLAudio.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ set(LLAUDIO_INCLUDE_DIRS
88
)
99

1010
add_definitions(-DOV_EXCLUDE_STATIC_CALLBACKS)
11-
12-
set(LLAUDIO_LIBRARIES llaudio ${OPENAL_LIBRARIES})
11+
# be exhaustive here
12+
set(LLAUDIO_LIBRARIES llaudio ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISENC_LIBRARIES} ${OGG_LIBRARIES} ${OPENAL_LIBRARIES})

‎indra/cmake/LLCommon.cmake‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,17 @@ include(Boost)
55
include(EXPAT)
66
include(ZLIB)
77

8-
if (DARWIN)
9-
include(CMakeFindFrameworks)
10-
find_library(CORESERVICES_LIBRARY CoreServices)
11-
endif (DARWIN)
12-
13-
148
set(LLCOMMON_INCLUDE_DIRS
15-
${LIBS_OPEN_DIR}/cwdebug
169
${LIBS_OPEN_DIR}/llcommon
1710
${APRUTIL_INCLUDE_DIR}
1811
${APR_INCLUDE_DIR}
12+
)
13+
set(LLCOMMON_SYSTEM_INCLUDE_DIRS
1914
${Boost_INCLUDE_DIRS}
2015
)
2116

22-
if (LINUX)
23-
# In order to support using ld.gold on linux, we need to explicitely
24-
# specify all libraries that llcommon uses.
25-
# llcommon uses `clock_gettime' which is provided by librt on linux.
26-
set(LLCOMMON_LIBRARIES llcommon rt)
27-
else (LINUX)
28-
set(LLCOMMON_LIBRARIES llcommon)
29-
endif (LINUX)
17+
set(LLCOMMON_LIBRARIES llcommon)
18+
3019

3120
set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a shared library.")
3221
if(LLCOMMON_LINK_SHARED)

0 commit comments

Comments
 (0)