ref: 2cb77fa8d9368d2ab863241a325501c74fc25db6
parent: 52daae6a177cd3996d2b07937bc9763c8a4c1155
author: Tuomas Virtanen <katajakasa@gmail.com>
date: Sun May 1 09:32:05 EDT 2016
Fix cmakelists and compiling help to match new paths
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@
set(CMAKE_C_FLAGS_MINSIZEREL "-ffast-math -Os -DNDEBUG")
link_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(../include/)
+include_directories(include/)
if(BUILD_EXAMPLES)
find_package(argtable2)
@@ -22,91 +22,91 @@
endif()
SET(SOURCES
- ../src/core/unload.c
- ../src/core/rendsig.c
- ../src/core/rendduh.c
- ../src/core/register.c
- ../src/core/readduh.c
- ../src/core/rawsig.c
- ../src/core/makeduh.c
- ../src/core/loadduh.c
- ../src/core/dumbfile.c
- ../src/core/duhtag.c
- ../src/core/duhlen.c
- ../src/core/atexit.c
- ../src/helpers/stdfile.c
- ../src/helpers/silence.c
- ../src/helpers/sampbuf.c
- ../src/helpers/riff.c
- ../src/helpers/resample.c
- ../src/helpers/memfile.c
- ../src/helpers/clickrem.c
- ../src/helpers/barray.c
- ../src/helpers/tarray.c
- ../src/it/xmeffect.c
- ../src/it/readxm2.c
- ../src/it/readxm.c
- ../src/it/readstm2.c
- ../src/it/readstm.c
- ../src/it/reads3m2.c
- ../src/it/reads3m.c
- ../src/it/readriff.c
- ../src/it/readptm.c
- ../src/it/readpsm.c
- ../src/it/readoldpsm.c
- ../src/it/readokt2.c
- ../src/it/readokt.c
- ../src/it/readmtm.c
- ../src/it/readmod2.c
- ../src/it/readmod.c
- ../src/it/readdsmf.c
- ../src/it/readasy.c
- ../src/it/readamf2.c
- ../src/it/readamf.c
- ../src/it/readam.c
- ../src/it/read6692.c
- ../src/it/read669.c
- ../src/it/ptmeffect.c
- ../src/it/loadxm2.c
- ../src/it/loadxm.c
- ../src/it/loadstm2.c
- ../src/it/loadstm.c
- ../src/it/loads3m2.c
- ../src/it/loads3m.c
- ../src/it/loadriff2.c
- ../src/it/loadriff.c
- ../src/it/loadptm2.c
- ../src/it/loadptm.c
- ../src/it/loadpsm2.c
- ../src/it/loadpsm.c
- ../src/it/loadoldpsm2.c
- ../src/it/loadoldpsm.c
- ../src/it/loadokt2.c
- ../src/it/loadokt.c
- ../src/it/loadmtm2.c
- ../src/it/loadmtm.c
- ../src/it/loadmod2.c
- ../src/it/loadmod.c
- ../src/it/loadasy2.c
- ../src/it/loadasy.c
- ../src/it/loadamf2.c
- ../src/it/loadamf.c
- ../src/it/load6692.c
- ../src/it/load669.c
- ../src/it/itunload.c
- ../src/it/itrender.c
- ../src/it/itread2.c
- ../src/it/itread.c
- ../src/it/itorder.c
- ../src/it/itmisc.c
- ../src/it/itload2.c
- ../src/it/itload.c
- ../src/it/readany.c
- ../src/it/loadany2.c
- ../src/it/loadany.c
- ../src/it/readany2.c
- ../src/helpers/resampler.c
- ../src/helpers/lpc.c
+ src/core/unload.c
+ src/core/rendsig.c
+ src/core/rendduh.c
+ src/core/register.c
+ src/core/readduh.c
+ src/core/rawsig.c
+ src/core/makeduh.c
+ src/core/loadduh.c
+ src/core/dumbfile.c
+ src/core/duhtag.c
+ src/core/duhlen.c
+ src/core/atexit.c
+ src/helpers/stdfile.c
+ src/helpers/silence.c
+ src/helpers/sampbuf.c
+ src/helpers/riff.c
+ src/helpers/resample.c
+ src/helpers/memfile.c
+ src/helpers/clickrem.c
+ src/helpers/barray.c
+ src/helpers/tarray.c
+ src/it/xmeffect.c
+ src/it/readxm2.c
+ src/it/readxm.c
+ src/it/readstm2.c
+ src/it/readstm.c
+ src/it/reads3m2.c
+ src/it/reads3m.c
+ src/it/readriff.c
+ src/it/readptm.c
+ src/it/readpsm.c
+ src/it/readoldpsm.c
+ src/it/readokt2.c
+ src/it/readokt.c
+ src/it/readmtm.c
+ src/it/readmod2.c
+ src/it/readmod.c
+ src/it/readdsmf.c
+ src/it/readasy.c
+ src/it/readamf2.c
+ src/it/readamf.c
+ src/it/readam.c
+ src/it/read6692.c
+ src/it/read669.c
+ src/it/ptmeffect.c
+ src/it/loadxm2.c
+ src/it/loadxm.c
+ src/it/loadstm2.c
+ src/it/loadstm.c
+ src/it/loads3m2.c
+ src/it/loads3m.c
+ src/it/loadriff2.c
+ src/it/loadriff.c
+ src/it/loadptm2.c
+ src/it/loadptm.c
+ src/it/loadpsm2.c
+ src/it/loadpsm.c
+ src/it/loadoldpsm2.c
+ src/it/loadoldpsm.c
+ src/it/loadokt2.c
+ src/it/loadokt.c
+ src/it/loadmtm2.c
+ src/it/loadmtm.c
+ src/it/loadmod2.c
+ src/it/loadmod.c
+ src/it/loadasy2.c
+ src/it/loadasy.c
+ src/it/loadamf2.c
+ src/it/loadamf.c
+ src/it/load6692.c
+ src/it/load669.c
+ src/it/itunload.c
+ src/it/itrender.c
+ src/it/itread2.c
+ src/it/itread.c
+ src/it/itorder.c
+ src/it/itmisc.c
+ src/it/itload2.c
+ src/it/itload.c
+ src/it/readany.c
+ src/it/loadany2.c
+ src/it/loadany.c
+ src/it/readany2.c
+ src/helpers/resampler.c
+ src/helpers/lpc.c
)
set(INSTALL_HEADERS
@@ -119,8 +119,8 @@
set(EXAMPLE_TARGETS "")
if(BUILD_EXAMPLES)
- add_executable(dumbout ../examples/dumbout.c)
- add_executable(dumbplay ../examples/dumbplay.c)
+ add_executable(dumbout examples/dumbout.c)
+ add_executable(dumbplay examples/dumbplay.c)
set_property(TARGET dumbout PROPERTY C_STANDARD 99)
set_property(TARGET dumbplay PROPERTY C_STANDARD 99)
if(MINGW)
@@ -130,7 +130,7 @@
target_link_libraries(dumbout ${ARGTABLE2_LIBRARY} m dumb)
target_link_libraries(dumbplay ${ARGTABLE2_LIBRARY} ${SDL2_LIBRARY} dumb)
- include_directories(${ARGTABLE2_INCLUDE_DIR} ${SDL2_INCLUDE_DIR} "../examples/")
+ include_directories(${ARGTABLE2_INCLUDE_DIR} ${SDL2_INCLUDE_DIR} "examples/")
set(EXAMPLE_TARGETS ${EXAMPLE_TARGETS} "dumbout" "dumbplay")
endif()
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -4,7 +4,7 @@
### 1.1. Example
-In libdumb cmake directory (dumb/cmake/), run:
+In libdumb project root, run:
```
mkdir -p build
cd build