diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-05-06 23:02:03 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-05-06 23:02:03 +0300 |
| commit | 900c429d900493d114f2141b0c815018a226a720 (patch) | |
| tree | f4689d08d67ab8a300227a7636660661da8e2a65 | |
| parent | 8836e2b0ca0a9b4a74bb765173b4529fccf042b1 (diff) | |
| download | libADLMIDI-900c429d900493d114f2141b0c815018a226a720.tar.gz libADLMIDI-900c429d900493d114f2141b0c815018a226a720.tar.bz2 libADLMIDI-900c429d900493d114f2141b0c815018a226a720.zip | |
Attempt to fix AppVeyor build
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | utils/gen_adldata/file_formats/load_ea.h | 4 | ||||
| -rw-r--r-- | utils/gen_adldata/file_formats/load_op2.h | 2 | ||||
| -rw-r--r-- | utils/gen_adldata/file_formats/load_wopl.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 6bcc333..0e80e73 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -87,7 +87,7 @@ build_script: - if [%COMPILER%]==[MinGW] set PATH=C:\MinGW\bin;%PATH:C:\Program Files\Git\usr\bin;=% - if [%COMPILER%]==[MinGW-w32] set PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%PATH:C:\Program Files\Git\usr\bin;=% - if [%COMPILER%]==[MinGW-w64] set PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH:C:\Program Files\Git\usr\bin;=% - - cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_PREFIX_PATH=. -DCMAKE_INSTALL_PREFIX=libADLMIDI -DWITH_GENADLDATA=ON -DlibADLMIDI_STATIC=ON -DlibADLMIDI_SHARED=ON .. + - cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_PREFIX_PATH=. -DCMAKE_INSTALL_PREFIX=libADLMIDI -DWITH_OLD_UTILS=ON -DWITH_GENADLDATA=ON -DlibADLMIDI_STATIC=ON -DlibADLMIDI_SHARED=ON .. - if [%COMPILER_FAMILY%]==[MinGW] cmake --build . --config %BUILD_TYPE% -- -j 2 - if [%COMPILER_FAMILY%]==[MinGW] mingw32-make install - if [%COMPILER_FAMILY%]==[MSVC] cmake --build . --config %BUILD_TYPE% --target install diff --git a/utils/gen_adldata/file_formats/load_ea.h b/utils/gen_adldata/file_formats/load_ea.h index 5e0baa4..86c1b54 100644 --- a/utils/gen_adldata/file_formats/load_ea.h +++ b/utils/gen_adldata/file_formats/load_ea.h @@ -90,11 +90,11 @@ static bool LoadEA(const char *fn, unsigned bank, const char *prefix) char name2[512]; if(gmno < 20) { - std::snprintf(name2, 512, "%sM%u", prefix, gmno); + snprintf(name2, 512, "%sM%u", prefix, gmno); } else { - std::snprintf(name2, 512, "%sunk%04X", prefix, offset); + snprintf(name2, 512, "%sunk%04X", prefix, offset); } size_t resno = InsertIns(tmp, tmp2, std::string(1, '\377') + name, name2); SetBank(bank, gmno, resno); diff --git a/utils/gen_adldata/file_formats/load_op2.h b/utils/gen_adldata/file_formats/load_op2.h index 8b7fec6..fc55a0e 100644 --- a/utils/gen_adldata/file_formats/load_op2.h +++ b/utils/gen_adldata/file_formats/load_op2.h @@ -82,7 +82,7 @@ static bool LoadDoom(const char *fn, unsigned bank, const char *prefix) int gmno = int(a < 128 ? a : ((a | 128) + 35)); char name2[512]; - std::snprintf(name2, 512, "%s%c%u", prefix, (gmno < 128 ? 'M' : 'P'), gmno & 127); + snprintf(name2, 512, "%s%c%u", prefix, (gmno < 128 ? 'M' : 'P'), gmno & 127); Doom_opl_instr &ins = *(Doom_opl_instr *) &data[offset2]; diff --git a/utils/gen_adldata/file_formats/load_wopl.h b/utils/gen_adldata/file_formats/load_wopl.h index 26a2611..eba94e3 100644 --- a/utils/gen_adldata/file_formats/load_wopl.h +++ b/utils/gen_adldata/file_formats/load_wopl.h @@ -207,9 +207,9 @@ static bool LoadWopl(const char *fn, unsigned bank, const char *prefix) char name2[512]; std::memset(name2, 0, 512); if(is_percussion) - std::snprintf(name2, 512, "%sP%u", prefix, gmno & 127); + snprintf(name2, 512, "%sP%u", prefix, gmno & 127); else - std::snprintf(name2, 512, "%sM%u", prefix, i); + snprintf(name2, 512, "%sM%u", prefix, i); if(!real4op && !tmp2.pseudo4op) { |