37 files changed, 244 insertions, 32 deletions

diff --git a/.gitignore b/.gitignore
index 0f3c9f9..dccade2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,6 @@ obj/*
 build-*
 *.user
 
+# Cmake caches
+build/*
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..f2a7aca
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,184 @@
+cmake_minimum_required (VERSION 2.8.11)
+project (libADLMIDI)
+
+#===========================================================================================
+# Strip garbage
+if(APPLE)
+    set(LINK_FLAGS_RELEASE  "${LINK_FLAGS_RELEASE} -dead_strip")
+ELSEIF(NOT MSVC)
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os -s -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-s")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os -s -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-s")
+    set(LINK_FLAGS_RELEASE  "${LINK_FLAGS_RELEASE} -Wl,--gc-sections -Wl,-s")
+ENDIF()
+
+# Global optimization flags
+IF(NOT MSVC)
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-omit-frame-pointer")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-omit-frame-pointer")
+ENDIF()
+
+if (CMAKE_BUILD_TYPE EQUAL "RELEASE")
+    add_definitions(-DNDEBUG)
+ENDIF()
+
+# Disable bogus MSVC warnings
+if(MSVC)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ENDIF()
+
+# -fPIC thing
+IF(NOT WIN32)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ENDIF()
+#===========================================================================================
+
+option(WITH_MIDIPLAY        "Build also demo MIDI player" OFF)
+option(WITH_OLD_UTILS       "Build also old utilities" OFF)
+option(WITH_EMBEDDED_BANKS  "Use embedded banks" ON)
+option(USE_DOSBOX_EMULATOR  "Use DosBox emulator" OFF)
+
+option(libADLMIDI_STATIC   "Build static library of libADLMIDI" ON)
+option(libADLMIDI_SHARED   "Build shared library of libADLMIDI" OFF)
+
+
+
+set(libADLMIDI_INSTALLS)
+
+include_directories(${libADLMIDI_SOURCE_DIR}/include)
+include_directories(${libADLMIDI_SOURCE_DIR}/src/)
+link_directories(${libADLMIDI_BINARY_DIR}/)
+
+if(WITH_OLD_UTILS)
+    # Old utility to dump AdLib bank files
+    add_executable(adldumpbank
+        ${libADLMIDI_SOURCE_DIR}/utils/dumpbank/dumpbank.cpp
+    )
+    list(APPEND libADLMIDI_INSTALLS adldumpbank)
+
+    # Old utility to dump AIL bank files
+    add_executable(adldumpmiles
+        ${libADLMIDI_SOURCE_DIR}/utils/dumpmiles/dumpmiles.cpp
+    )
+    list(APPEND libADLMIDI_INSTALLS adldumpmiles)
+endif()
+
+if(WITH_EMBEDDED_BANKS)
+    add_executable(gen_adldata
+        ${libADLMIDI_SOURCE_DIR}/utils/gen_adldata/gen_adldata.cc
+        ${libADLMIDI_SOURCE_DIR}/utils/gen_adldata/progs_cache.cpp
+        ${libADLMIDI_SOURCE_DIR}/utils/gen_adldata/measurer.cpp
+        ${libADLMIDI_SOURCE_DIR}/utils/gen_adldata/ini/ini_processing.cpp
+        ${libADLMIDI_SOURCE_DIR}/src/nukedopl3.c
+        ${libADLMIDI_SOURCE_DIR}/src/dbopl.cpp
+    )
+    target_link_libraries(gen_adldata pthread)
+
+    add_custom_target (
+        gen-adldata-run
+        COMMAND ${libADLMIDI_BINARY_DIR}/gen_adldata ${libADLMIDI_SOURCE_DIR}/src/adldata.cpp
+        WORKING_DIRECTORY ${libADLMIDI_SOURCE_DIR}
+    )
+    add_dependencies(gen-adldata-run gen_adldata)
+endif()
+
+
+set(libADLMIDI_SOURCES)
+
+list(APPEND libADLMIDI_SOURCES
+    ${libADLMIDI_SOURCE_DIR}/src/adlmidi.cpp
+    ${libADLMIDI_SOURCE_DIR}/src/adlmidi_load.cpp
+    ${libADLMIDI_SOURCE_DIR}/src/adlmidi_midiplay.cpp
+    ${libADLMIDI_SOURCE_DIR}/src/adlmidi_opl3.cpp
+    ${libADLMIDI_SOURCE_DIR}/src/adlmidi_private.cpp
+    ${libADLMIDI_SOURCE_DIR}/src/adlmidi_mus2mid.c
+    ${libADLMIDI_SOURCE_DIR}/src/adlmidi_xmi2mid.c
+)
+
+if(USE_DOSBOX_EMULATOR)
+    add_definitions(-DADLMIDI_USE_DOSBOX_OPL)
+    list(APPEND libADLMIDI_SOURCES
+        ${libADLMIDI_SOURCE_DIR}/src/dbopl.cpp
+    )
+else()
+    list(APPEND libADLMIDI_SOURCES
+        ${libADLMIDI_SOURCE_DIR}/src/nukedopl3.c
+    )
+endif()
+
+if(WITH_EMBEDDED_BANKS)
+    list(APPEND libADLMIDI_SOURCES
+        ${libADLMIDI_SOURCE_DIR}/src/adldata.cpp
+    )
+else()
+    add_definitions(-DDISABLE_EMBEDDED_BANKS)
+endif()
+
+if(libADLMIDI_STATIC)
+    add_library(ADLMIDI_static STATIC ${libADLMIDI_SOURCES})
+    set_target_properties(ADLMIDI_static PROPERTIES OUTPUT_NAME ADLMIDI)
+    target_include_directories(ADLMIDI_static PUBLIC ${SDLMixerX_SOURCE_DIR}/include)
+    list(APPEND libADLMIDI_INSTALLS ADLMIDI_static)
+    if(WITH_EMBEDDED_BANKS)
+        add_dependencies(ADLMIDI_static gen-adldata-run)
+    endif()
+endif()
+
+if(libADLMIDI_SHARED)
+    add_library(ADLMIDI_shared SHARED ${libADLMIDI_SOURCES})
+    set_target_properties(ADLMIDI_shared PROPERTIES OUTPUT_NAME ADLMIDI)
+    target_include_directories(ADLMIDI_shared PUBLIC ${SDLMixerX_SOURCE_DIR}/include)
+    list(APPEND libADLMIDI_INSTALLS ADLMIDI_shared)
+    if(WITH_EMBEDDED_BANKS)
+        add_dependencies(ADLMIDI_shared gen-adldata-run)
+    endif()
+endif()
+
+if(WITH_MIDIPLAY)
+    find_library(SDL2_LIBRARY SDL2 REQUIRED)
+    include_directories(${SDL2_INCLUDE_DIR})
+    message("Found ${SDL2_LIBRARY}")
+
+    add_executable(adlmidiplay
+        ${libADLMIDI_SOURCE_DIR}/utils/midiplay/adlmidiplay.cpp
+        ${libADLMIDI_SOURCE_DIR}/utils/midiplay/wave_writer.c
+    )
+
+    if(WIN32)
+        target_link_libraries(adlmidiplay ADLMIDI ${SDL2_LIBRARY} pthread)
+    else()
+        target_link_libraries(adlmidiplay ADLMIDI ${SDL2_LIBRARY} pthread dl)
+    endif()
+
+    if(libADLMIDI_SHARED)
+        add_dependencies(adlmidiplay ADLMIDI_shared)
+        # ========= WIP =========
+        # set_target_properties(adlmidiplay PROPERTIES COMPILE_FLAGS "-Wl,-rpath='$$ORIGIN/../lib'")
+    else()
+        if(NOT libADLMIDI_STATIC)
+            message(FATAL_ERROR "libADLMIDI is required to be built!")
+        endif()
+        add_dependencies(adlmidiplay ADLMIDI_static)
+    endif()
+
+    list(APPEND libADLMIDI_INSTALLS adlmidiplay)
+endif()
+
+install(TARGETS ${libADLMIDI_INSTALLS}
+        RUNTIME DESTINATION "bin"
+        LIBRARY DESTINATION "lib"
+        ARCHIVE DESTINATION "lib"
+        INCLUDES DESTINATION "include")
+
+install(FILES
+        include/adlmidi.h
+        DESTINATION include/)
+
+message("==== libADLMIDI options ====")
+message("WITH_MIDIPLAY          = ${WITH_MIDIPLAY}")
+message("WITH_EMBEDDED_BANKS    = ${WITH_EMBEDDED_BANKS}")
+message("USE_DOSBOX_EMULATOR    = ${USE_DOSBOX_EMULATOR}")
+message("libADLMIDI_STATIC      = ${libADLMIDI_STATIC}")
+message("libADLMIDI_SHARED      = ${libADLMIDI_SHARED}")
+
+
diff --git a/Makefile b/Makefile.old
index f1a2ead..f1a2ead 100644
--- a/Makefile
+++ b/Makefile.old
diff --git a/src/adlmidi.h b/include/adlmidi.h
index c82ef63..c82ef63 100644
--- a/src/adlmidi.h
+++ b/include/adlmidi.h
diff --git a/libADLMIDI-test.pro b/libADLMIDI-test.pro
index 7be6bd8..4ddc5b7 100644
--- a/libADLMIDI-test.pro
+++ b/libADLMIDI-test.pro
@@ -7,16 +7,16 @@ DESTDIR=$$PWD/bin/
 
 #INCLUDEPATH += $$PWD/AudioCodecs/build/install/include
 #LIBS += -L$$PWD/AudioCodecs/build/install/lib
-INCLUDEPATH += $$PWD/src
+INCLUDEPATH += $$PWD/src $$PWD/include
 #LIBS += -Wl,-Bstatic -lSDL2 -Wl,-Bdynamic -lpthread -ldl
 LIBS += -lSDL2 -lpthread -ldl
 
 #DEFINES += DISABLE_EMBEDDED_BANKS
 
 HEADERS += \
+    include/adlmidi.h \
     src/adlbank.h \
     src/adldata.hh \
-    src/adlmidi.h \
     src/adlmidi_mus2mid.h \
     src/adlmidi_private.hpp \
     src/adlmidi_xmi2mid.h \
@@ -35,5 +35,6 @@ SOURCES += \
     src/adlmidi_private.cpp \
     src/adlmidi_xmi2mid.c \
     src/nukedopl3.c \
-    src/midiplay/adlmidiplay.cpp \
-    src/midiplay/wave_writer.c
+    utils/midiplay/adlmidiplay.cpp \
+    utils/midiplay/wave_writer.c
+
diff --git a/test.wopl b/test.wopl
new file mode 100644
index 0000000..f2573e1
--- /dev/null
+++ b/test.wopl
diff --git a/src/dumpbank/dumpbank.cc b/utils/dumpbank/dumpbank.cpp
index bd78af7..6996681 100644
--- a/src/dumpbank/dumpbank.cc
+++ b/utils/dumpbank/dumpbank.cpp
@@ -1,7 +1,7 @@
 //#ifdef __MINGW32__
 //typedef struct vswprintf {} swprintf;
 //#endif
-#include <stdio.h>
+#include <cstdio>
 #include <vector>
 #include <cstring>
 
@@ -78,19 +78,19 @@ static void LoadBNK1(const std::vector<unsigned char>& data)
     const BNK1_header& bnk1 = *(const BNK1_header*) &data[0];
     const BNK1_record* names = (const BNK1_record*) &data[ bnk1.name_list ];
     const BNK1_instrument* ins = (const BNK1_instrument*) &data[ bnk1.inst_data ];
-    printf("BNK1 version: %d.%d\n", bnk1.maj_vers, bnk1.min_vers);
+    std::printf("BNK1 version: %d.%d\n", bnk1.maj_vers, bnk1.min_vers);
     for(unsigned a=0; a<bnk1.ins_entries; ++a)
     {
-        printf("%04X %02X %-9.9s: ",
+        std::printf("%04X %02X %-9.9s: ",
             names[a].index, names[a].used, names[a].name);
 
         const BNK1_instrument& i = ins[ names[a].index ];
-        printf("%02X %02X %X %X",
+        std::printf("%02X %02X %X %X",
             i.sound_mode, i.voice_num, i.waveforms[0], i.waveforms[1]);
         for(unsigned b=0; b<2; ++b)
         {
-            printf(" | ");
-            printf("%X %X %X %X %X %X %X %X %02X %X %X %X %X",
+            std::printf(" | ");
+            std::printf("%X %X %X %X %X %X %X %X %02X %X %X %X %X",
                 i.ops[b].key_scale_lvl,
                 i.ops[b].freq_mult,
                 b==1 ? 0 : i.ops[b].feedback,
@@ -105,17 +105,17 @@ static void LoadBNK1(const std::vector<unsigned char>& data)
                 i.ops[b].env_scaling,
                 b==1 ? 0 : i.ops[b].connection);
         }
-        printf("\n");
+        std::printf("\n");
     }
 }
 static void LoadBNK2(const std::vector<unsigned char>& data)
 {
     const BNK2_header& bnk2 = *(const BNK2_header*) &data[0];
     const BNK2_record* names = (const BNK2_record*) &data[ sizeof(bnk2) ];
-    printf("BNK2 version: %d, lost space %d\n", bnk2.file_ver, bnk2.lostSpace);
+    std::printf("BNK2 version: %d, lost space %d\n", bnk2.file_ver, bnk2.lostSpace);
     for(unsigned a=0; a<bnk2.ins_entries; ++a)
     {
-        printf("%3.3s %-12.12s %02X %08X %04X %04X: ",
+        std::printf("%3.3s %-12.12s %02X %08X %04X %04X: ",
             names[a].O3_sig,
             names[a].key,
             names[a].used,
@@ -124,12 +124,12 @@ static void LoadBNK2(const std::vector<unsigned char>& data)
             names[a].allocBSize);
 
         const BNK2_instrument& i = *(const BNK2_instrument*) &data[ names[a].dataOffset ];
-        printf("%02X %02X %02X %02X",
+        std::printf("%02X %02X %02X %02X",
             i.C4xxxFFFC, i.xxP24NNN, i.TTTTTTTT, i.xxxxxxxx);
         for(unsigned b=0; b<4; ++b)
         {
-            printf(" | ");
-            printf("%02X %02X %02X %02X %02X %02X",
+            std::printf(" | ");
+            std::printf("%02X %02X %02X %02X %02X %02X",
                 i.ops[b].AVEKMMMM,
                 i.ops[b].KKLLLLLL,
                 i.ops[b].AAAADDDD,
@@ -137,18 +137,30 @@ static void LoadBNK2(const std::vector<unsigned char>& data)
                 i.ops[b].DxxxxWWW,
                 i.ops[b].xxxxxxxx);
         }
-        printf("\n");
+        std::printf("\n");
     }
 }
 
 static void LoadBNK(const char* fn)
 {
     FILE* fp = fopen(fn, "rb");
-    fseek(fp, 0, SEEK_END);
+    if(!fp)
+    {
+        std::fprintf(stderr, "ERROR: Can't open %s file!", fn);
+        return;
+    }
+
+    std::fseek(fp, 0, SEEK_END);
     std::vector<unsigned char> data(ftell(fp));
-    rewind(fp);
-    fread(&data[0], 1, data.size(), fp),
-    fclose(fp);
+    std::rewind(fp);
+    size_t got = std::fread(&data[0], 1, data.size(), fp);
+    std::fclose(fp);
+
+    if(got == 0)
+    {
+        std::fprintf(stderr, "ERROR: Can't read %s file!", fn);
+        return;
+    }
 
     const BNK1_header& bnk1 = *(const BNK1_header*) &data[0];
     const BNK2_header& bnk2 = *(const BNK2_header*) &data[0];
@@ -158,7 +170,7 @@ static void LoadBNK(const char* fn)
     else if(std::memcmp(bnk2.signature, "Accomp. Bank, (C) AdLib Inc", 28) == 0)
         LoadBNK2(data);
     else
-        fprintf(stderr, "%s: Unknown format\n", fn);
+        std::fprintf(stderr, "%s: Unknown format\n", fn);
 }
 
 int main(int argc, const char* const* argv)
diff --git a/src/dumpmiles/dumpmiles.cc b/utils/dumpmiles/dumpmiles.cpp
index 2715d16..832da93 100644
--- a/src/dumpmiles/dumpmiles.cc
+++ b/utils/dumpmiles/dumpmiles.cpp
@@ -1,17 +1,29 @@
 //#ifdef __MINGW32__
 //typedef struct vswprintf {} swprintf;
 //#endif
-#include <stdio.h>
+#include <cstdio>
 #include <vector>
 
 static void LoadMiles(const char* fn)
 {
     FILE* fp = fopen(fn, "rb");
-    fseek(fp, 0, SEEK_END);
+    if(!fp)
+    {
+        std::fprintf(stderr, "ERROR: Can't open %s file!", fn);
+        return;
+    }
+
+    std::fseek(fp, 0, SEEK_END);
     std::vector<unsigned char> data(ftell(fp));
-    rewind(fp);
-    fread(&data[0], 1, data.size(), fp),
-    fclose(fp);
+    std::rewind(fp);
+    size_t got = std::fread(&data[0], 1, data.size(), fp);
+    std::fclose(fp);
+
+    if(got == 0)
+    {
+        std::fprintf(stderr, "ERROR: Can't read %s file!", fn);
+        return;
+    }
 
     for(unsigned a=0; a<500; ++a)
     {
@@ -24,13 +36,13 @@ static void LoadMiles(const char* fn)
         unsigned length = data[offset] + data[offset+1]*256;
         signed char notenum = data[offset+2];
 
-        printf("%02X %02X ", gmnumber,gmnumber2); //, offset);
+        std::printf("%02X %02X ", gmnumber,gmnumber2); //, offset);
         for(unsigned b=0; b<length; ++b)
         {
             if(b > 3 && (b-3)%11 == 0) printf("\n                        ");
-            printf("%02X ", data[offset+b]);
+            std::printf("%02X ", data[offset+b]);
         }
-        printf("\n");
+        std::printf("\n");
     }
 }
 
diff --git a/src/gen_adldata/file_formats/common.h b/utils/gen_adldata/file_formats/common.h
index d06059e..d06059e 100644
--- a/src/gen_adldata/file_formats/common.h
+++ b/utils/gen_adldata/file_formats/common.h
diff --git a/src/gen_adldata/file_formats/load_ail.h b/utils/gen_adldata/file_formats/load_ail.h
index 4c6c482..4c6c482 100644
--- a/src/gen_adldata/file_formats/load_ail.h
+++ b/utils/gen_adldata/file_formats/load_ail.h
diff --git a/src/gen_adldata/file_formats/load_bisqwit.h b/utils/gen_adldata/file_formats/load_bisqwit.h
index 4928efa..4928efa 100644
--- a/src/gen_adldata/file_formats/load_bisqwit.h
+++ b/utils/gen_adldata/file_formats/load_bisqwit.h
diff --git a/src/gen_adldata/file_formats/load_bnk.h b/utils/gen_adldata/file_formats/load_bnk.h
index 79ce5f5..79ce5f5 100644
--- a/src/gen_adldata/file_formats/load_bnk.h
+++ b/utils/gen_adldata/file_formats/load_bnk.h
diff --git a/src/gen_adldata/file_formats/load_bnk2.h b/utils/gen_adldata/file_formats/load_bnk2.h
index 202402c..202402c 100644
--- a/src/gen_adldata/file_formats/load_bnk2.h
+++ b/utils/gen_adldata/file_formats/load_bnk2.h
diff --git a/src/gen_adldata/file_formats/load_ibk.h b/utils/gen_adldata/file_formats/load_ibk.h
index 6370ad0..6370ad0 100644
--- a/src/gen_adldata/file_formats/load_ibk.h
+++ b/utils/gen_adldata/file_formats/load_ibk.h
diff --git a/src/gen_adldata/file_formats/load_jv.h b/utils/gen_adldata/file_formats/load_jv.h
index f35de03..f35de03 100644
--- a/src/gen_adldata/file_formats/load_jv.h
+++ b/utils/gen_adldata/file_formats/load_jv.h
diff --git a/src/gen_adldata/file_formats/load_op2.h b/utils/gen_adldata/file_formats/load_op2.h
index 30a118f..30a118f 100644
--- a/src/gen_adldata/file_formats/load_op2.h
+++ b/utils/gen_adldata/file_formats/load_op2.h
diff --git a/src/gen_adldata/file_formats/load_tmb.h b/utils/gen_adldata/file_formats/load_tmb.h
index c5a3f60..c5a3f60 100644
--- a/src/gen_adldata/file_formats/load_tmb.h
+++ b/utils/gen_adldata/file_formats/load_tmb.h
diff --git a/src/gen_adldata/file_formats/load_wopl.h b/utils/gen_adldata/file_formats/load_wopl.h
index 300a3a0..300a3a0 100644
--- a/src/gen_adldata/file_formats/load_wopl.h
+++ b/utils/gen_adldata/file_formats/load_wopl.h
diff --git a/src/gen_adldata/gen_adldata.cc b/utils/gen_adldata/gen_adldata.cc
index 6c77a12..6c77a12 100644
--- a/src/gen_adldata/gen_adldata.cc
+++ b/utils/gen_adldata/gen_adldata.cc
diff --git a/src/gen_adldata/gen_adldata.pro b/utils/gen_adldata/gen_adldata.pro
index 74c504e..74c504e 100644
--- a/src/gen_adldata/gen_adldata.pro
+++ b/utils/gen_adldata/gen_adldata.pro
diff --git a/src/gen_adldata/ini/IniProcessor.pri b/utils/gen_adldata/ini/IniProcessor.pri
index cdadb59..cdadb59 100644
--- a/src/gen_adldata/ini/IniProcessor.pri
+++ b/utils/gen_adldata/ini/IniProcessor.pri
diff --git a/src/gen_adldata/ini/ini_processing.cpp b/utils/gen_adldata/ini/ini_processing.cpp
index 2f15821..2f15821 100644
--- a/src/gen_adldata/ini/ini_processing.cpp
+++ b/utils/gen_adldata/ini/ini_processing.cpp
diff --git a/src/gen_adldata/ini/ini_processing.h b/utils/gen_adldata/ini/ini_processing.h
index 52ab2e2..52ab2e2 100644
--- a/src/gen_adldata/ini/ini_processing.h
+++ b/utils/gen_adldata/ini/ini_processing.h
diff --git a/src/gen_adldata/ini/ini_processing_variant.h b/utils/gen_adldata/ini/ini_processing_variant.h
index 34f999a..34f999a 100644
--- a/src/gen_adldata/ini/ini_processing_variant.h
+++ b/utils/gen_adldata/ini/ini_processing_variant.h
diff --git a/src/gen_adldata/measurer.cpp b/utils/gen_adldata/measurer.cpp
index 6020ea0..8bb0772 100644
--- a/src/gen_adldata/measurer.cpp
+++ b/utils/gen_adldata/measurer.cpp
@@ -2,9 +2,9 @@
 #include <cmath>
 
 #ifndef ADLMIDI_USE_DOSBOX_OPL
-#include "../nukedopl3.h"
+#include "nukedopl3.h"
 #else
-#include "../dbopl.h"
+#include "dbopl.h"
 #endif
 
 DurationInfo MeasureDurations(const ins &in)
diff --git a/src/gen_adldata/measurer.h b/utils/gen_adldata/measurer.h
index b9ae3c6..b9ae3c6 100644
--- a/src/gen_adldata/measurer.h
+++ b/utils/gen_adldata/measurer.h
diff --git a/src/gen_adldata/midi_inst_list.h b/utils/gen_adldata/midi_inst_list.h
index 61c9119..61c9119 100644
--- a/src/gen_adldata/midi_inst_list.h
+++ b/utils/gen_adldata/midi_inst_list.h
diff --git a/src/gen_adldata/progs_cache.cpp b/utils/gen_adldata/progs_cache.cpp
index 4aec9be..4aec9be 100644
--- a/src/gen_adldata/progs_cache.cpp
+++ b/utils/gen_adldata/progs_cache.cpp
diff --git a/src/gen_adldata/progs_cache.h b/utils/gen_adldata/progs_cache.h
index 007c3b4..007c3b4 100644
--- a/src/gen_adldata/progs_cache.h
+++ b/utils/gen_adldata/progs_cache.h
diff --git a/src/gen_adldata/scrapped.txt b/utils/gen_adldata/scrapped.txt
index 10c15cd..10c15cd 100644
--- a/src/gen_adldata/scrapped.txt
+++ b/utils/gen_adldata/scrapped.txt
diff --git a/src/midiplay/Makefile b/utils/midiplay/Makefile
index f2512b4..f2512b4 100644
--- a/src/midiplay/Makefile
+++ b/utils/midiplay/Makefile
diff --git a/src/midiplay/Makefile.win32 b/utils/midiplay/Makefile.win32
index 05e192f..05e192f 100644
--- a/src/midiplay/Makefile.win32
+++ b/utils/midiplay/Makefile.win32
diff --git a/src/midiplay/adlmidiplay.cpp b/utils/midiplay/adlmidiplay.cpp
index 7c8766d..7c8766d 100644
--- a/src/midiplay/adlmidiplay.cpp
+++ b/utils/midiplay/adlmidiplay.cpp
diff --git a/src/midiplay/wave_writer.c b/utils/midiplay/wave_writer.c
index 0bfaf68..0bfaf68 100755
--- a/src/midiplay/wave_writer.c
+++ b/utils/midiplay/wave_writer.c
diff --git a/src/midiplay/wave_writer.h b/utils/midiplay/wave_writer.h
index 6d49718..6d49718 100755
--- a/src/midiplay/wave_writer.h
+++ b/utils/midiplay/wave_writer.h
diff --git a/src/test/adldatatest.cc b/utils/test/adldatatest.cc
index 9f992c0..9f992c0 100644
--- a/src/test/adldatatest.cc
+++ b/utils/test/adldatatest.cc
diff --git a/src/test/test.cc b/utils/test/test.cc
index ff8515b..ff8515b 100644
--- a/src/test/test.cc
+++ b/utils/test/test.cc