Skip to content

Commit 9cd805b

Browse files
cleaning liblo adding video
1 parent 6ae17a0 commit 9cd805b

14 files changed

+34
-4261
lines changed

Makefile

+14-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
default:
22
@mkdir build
3-
@cd build && cmake .. && make && cd ..
3+
@cd build && cmake .. && make
4+
@@cd ..
45

56
nox11:
6-
@mkdir build
7-
@cd build && cmake -DNO_X11 .. && make && cd ..
7+
@mkdir build_nox11
8+
@cd build_nox11 && cmake -DNO_X11 .. && make
9+
@cd ..
810

911
wasm:
10-
@mkdir build
11-
@cd build && cmake .. -DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake && make && cd ..
12+
@mkdir build_wasm
13+
@cd build_wasm && cmake .. -DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake && make
14+
@cd ..
1215

1316
clean:
14-
@rm -rf build
17+
@rm -rf build*
1518

1619
install:
17-
@cd build
18-
@sudo make install
20+
@cd build && make install
21+
@cd ..
22+
23+
install_nox11:
24+
@cd build_nox11 && make install
1925
@cd ..

deps/liblo/cmake/CMakeLists.txt

+17-17
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if (MSVC)
6060
endif()
6161
endif()
6262

63-
set(LIBRARY_SHARED lo_shared)
63+
# set(LIBRARY_SHARED lo_shared)
6464
if (WITH_STATIC)
6565
set(LIBRARY_STATIC lo_static)
6666
endif()
@@ -175,7 +175,7 @@ if (WITH_CPP_TESTS)
175175
endif()
176176

177177
# Library
178-
add_library(${LIBRARY_SHARED} SHARED ${LIBRARY_SOURCES})
178+
# add_library(${LIBRARY_SHARED} SHARED ${LIBRARY_SOURCES})
179179
if (WITH_STATIC)
180180
add_library(${LIBRARY_STATIC} STATIC ${LIBRARY_SOURCES})
181181
endif()
@@ -206,7 +206,7 @@ endif()
206206
if(THREADING)
207207
set(ENABLE_THREADS 1)
208208

209-
target_link_libraries(${LIBRARY_SHARED} Threads::Threads)
209+
# target_link_libraries(${LIBRARY_SHARED} Threads::Threads)
210210
if (WITH_STATIC)
211211
target_link_libraries(${LIBRARY_STATIC} Threads::Threads)
212212
endif()
@@ -219,17 +219,17 @@ else()
219219
endif()
220220

221221
if(CMAKE_SYSTEM_NAME MATCHES "Windows")
222-
target_link_libraries(${LIBRARY_SHARED} "user32" "wsock32" "ws2_32" "iphlpapi")
222+
# target_link_libraries(${LIBRARY_SHARED} "user32" "wsock32" "ws2_32" "iphlpapi")
223223
target_link_libraries(${LIBRARY_STATIC} "user32" "wsock32" "ws2_32" "iphlpapi")
224224
if(THREADING AND Threads_FOUND)
225-
target_link_libraries(${LIBRARY_SHARED} ${CMAKE_THREAD_LIBS_INIT})
225+
# target_link_libraries(${LIBRARY_SHARED} ${CMAKE_THREAD_LIBS_INIT})
226226
if (WITH_STATIC)
227227
target_link_libraries(${LIBRARY_STATIC} ${CMAKE_THREAD_LIBS_INIT})
228228
endif()
229229
endif()
230230

231-
set_target_properties(${LIBRARY_SHARED} PROPERTIES
232-
COMPILE_DEFINITIONS "LIBLO_DLL")
231+
# set_target_properties(${LIBRARY_SHARED} PROPERTIES
232+
# COMPILE_DEFINITIONS "LIBLO_DLL")
233233
if (WITH_STATIC)
234234
set_target_properties(${LIBRARY_STATIC} PROPERTIES
235235
COMPILE_DEFINITIONS "LIBLO_LIB")
@@ -242,7 +242,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
242242
set(DEFTHREADS ";;")
243243
endif()
244244
else()
245-
target_link_libraries(${LIBRARY_SHARED} "m")
245+
# target_link_libraries(${LIBRARY_SHARED} "m")
246246
if (WITH_STATIC)
247247
target_link_libraries(${LIBRARY_STATIC} "m")
248248
endif()
@@ -251,14 +251,14 @@ endif()
251251
set(LO_INCLUDE_DIRS
252252
${CMAKE_CURRENT_BINARY_DIR}
253253
${CMAKE_CURRENT_SOURCE_DIR}/..)
254-
target_include_directories(${LIBRARY_SHARED} PUBLIC ${LO_INCLUDE_DIRS})
254+
# target_include_directories(${LIBRARY_SHARED} PUBLIC ${LO_INCLUDE_DIRS})
255255
if (WITH_STATIC)
256256
target_include_directories(${LIBRARY_STATIC} PUBLIC ${LO_INCLUDE_DIRS})
257257
endif()
258258

259259
foreach(PROG ${PROGRAMS})
260260
target_include_directories(${PROG} PUBLIC ${LO_INCLUDE_DIRS})
261-
target_link_libraries(${PROG} PUBLIC ${LIBRARY_SHARED})
261+
# target_link_libraries(${PROG} PUBLIC ${LIBRARY_SHARED})
262262
endforeach(PROG)
263263

264264
foreach(PROG ${TOOLS})
@@ -301,11 +301,11 @@ set(LO_SO_VERSION
301301
"{${CONFIGURE_AC_CURRENT}, ${CONFIGURE_AC_REVISION}, ${CONFIGURE_AC_AGE}}")
302302

303303
math(EXPR CURRENT_MINUS_AGE "${CONFIGURE_AC_CURRENT} - ${CONFIGURE_AC_AGE}")
304-
set_target_properties(${LIBRARY_SHARED} PROPERTIES
305-
VERSION "${CURRENT_MINUS_AGE}.${CONFIGURE_AC_AGE}.${CONFIGURE_AC_REVISION}"
306-
SOVERSION "${CURRENT_MINUS_AGE}"
307-
OUTPUT_NAME "lo"
308-
)
304+
# set_target_properties(${LIBRARY_SHARED} PROPERTIES
305+
# VERSION "${CURRENT_MINUS_AGE}.${CONFIGURE_AC_AGE}.${CONFIGURE_AC_REVISION}"
306+
# SOVERSION "${CURRENT_MINUS_AGE}"
307+
# OUTPUT_NAME "lo"
308+
# )
309309
if (WITH_STATIC)
310310
set_target_properties(${LIBRARY_STATIC} PROPERTIES
311311
OUTPUT_NAME "lo"
@@ -341,8 +341,8 @@ if(MSVC)
341341
set_target_properties(${LIBRARY_STATIC} PROPERTIES
342342
LINK_FLAGS "/DEF:\"${CMAKE_CURRENT_BINARY_DIR}/src/liblo.def\"")
343343
endif()
344-
set_target_properties(${LIBRARY_SHARED} PROPERTIES
345-
LINK_FLAGS "/DEF:\"${CMAKE_CURRENT_BINARY_DIR}/src/liblo.def\"")
344+
# set_target_properties(${LIBRARY_SHARED} PROPERTIES
345+
# LINK_FLAGS "/DEF:\"${CMAKE_CURRENT_BINARY_DIR}/src/liblo.def\"")
346346
else()
347347
configure_file(
348348
${CMAKE_CURRENT_SOURCE_DIR}/config.h.in

deps/liblo/doc/Makefile.am

-32
This file was deleted.

0 commit comments

Comments
 (0)