Move to c++

CMakeLists.txt

@@ -18,20 +18,20 @@ endif()
 
 set(LOADTRK_SOURCES
     ${CMAKE_BINARY_DIR}/src/goatdata.c
-    src/loadtrk.c
-    src/gsong.c
-    src/gorder.c
-    src/gpattern.c
-    src/ginstr.c
-    src/gtable.c
-    src/gplay.c
-    src/gdisplay.c
-    src/gfile.c
-    src/greloc.c
-    src/ghelp.c
-    src/gsound.c
-    src/gconsole.c
-    src/gsid.cpp
+    src/loadtrk.cpp
+    src/song.cpp
+    src/order.cpp
+    src/pattern.cpp
+    src/instr.cpp
+    src/table.cpp
+    src/play.cpp
+    src/display.cpp
+    src/file.cpp
+    src/reloc.cpp
+    src/help.cpp
+    src/sound.cpp
+    src/console.cpp
+    src/sid.cpp
     src/asm/asmtab.c
     src/asm/chnkpool.c
     src/asm/expr.c
@@ -43,13 +43,12 @@ set(LOADTRK_SOURCES
     src/asm/parse.c
     src/asm/pc.c
     src/asm/vec.c
-    src/bme/bme_gfx.c
-    src/bme/bme_snd.c
-    src/bme/bme_win.c
-    src/bme/bme_mou.c
-    src/bme/bme_io.c
-    src/bme/bme_end.c
-    src/bme/bme.c
+    src/bme/bme_gfx.cpp
+    src/bme/bme_snd.cpp
+    src/bme/bme_win.cpp
+    src/bme/bme_io.cpp
+    src/bme/bme_end.cpp
+    src/bme/bme.cpp
     src/rtmidi/rtmidi_c.h
     src/rtmidi/rtmidi_c.cpp
     src/rtmidi/RtMidi.h
@@ -62,16 +61,16 @@ if(MINGW)
 endif(MINGW)
 
 set(MOD2SNG_SOURCES
-    src/mod2sng.c
-    src/bme/bme_end.c)
+    src/mod2sng.cpp
+    src/bme/bme_end.cpp)
 
 set(INS2SND2_SOURCES
-    src/ins2snd2.c
-    src/bme/bme_end.c)
+    src/ins2snd2.cpp
+    src/bme/bme_end.cpp)
 
 set(SNGSPLI2_SOURCES
-    src/sngspli2.c
-    src/bme/bme_end.c)
+    src/sngspli2.cpp
+    src/bme/bme_end.cpp)
 
 include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/src/bme)
@@ -80,8 +79,8 @@ include_directories(${CMAKE_BINARY_DIR}/src/residfp)
 
 find_package(SDL3 REQUIRED)
 
-add_executable(datafile src/bme/datafile.c src/bme/bme_end.c)
-add_executable(dat2inc src/bme/dat2inc.c)
+add_executable(datafile src/bme/datafile.cpp src/bme/bme_end.cpp)
+add_executable(dat2inc src/bme/dat2inc.cpp)
 
 target_include_directories(datafile PUBLIC SDL3::Headers)
 

src/bme/bme.c → src/bme/bme.cpp

@@ -3,6 +3,5 @@
 //
 
 #include "bme_err.h"
-#include "bme_cfg.h"
 
 int bme_error = BME_OK;

src/bme/bme.h

@@ -3,15 +3,22 @@
 #ifndef BME_H
 #define BME_H
 
-#include <SDL3/SDL.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "bme_main.h"
-#include "bme_cfg.h"
 #include "bme_err.h"
 #include "bme_snd.h"
 #include "bme_gfx.h"
 #include "bme_win.h"
-#include "bme_mou.h"
 #include "bme_io.h"
 #include "bme_end.h"
 
+#include <SDL3/SDL.h>
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/bme/bme_end.c → src/bme/bme_end.cpp

@@ -1,12 +1,14 @@
-#include <stdint.h>
-#include <stdio.h>
+#include <cstdint>
+#include <cstdio>
+
+extern "C" {
 
 void fwrite8(FILE *file, unsigned data)
 {
     uint8_t bytes[1];
 
     bytes[0] = data;
-    fwrite(bytes, 1, 1, file);
+    std::fwrite(bytes, 1, 1, file);
 }
 
 void fwritele16(FILE *file, unsigned data)
@@ -15,7 +17,7 @@ void fwritele16(FILE *file, unsigned data)
 
     bytes[0] = data;
     bytes[1] = data >> 8;
-    fwrite(bytes, 2, 1, file);
+    std::fwrite(bytes, 2, 1, file);
 }
 
 void fwritele32(FILE *file, unsigned data)
@@ -26,47 +28,47 @@ void fwritele32(FILE *file, unsigned data)
     bytes[1] = data >> 8;
     bytes[2] = data >> 16;
     bytes[3] = data >> 24;
-    fwrite(bytes, 4, 1, file);
+    std::fwrite(bytes, 4, 1, file);
 }
 
 unsigned fread8(FILE *file)
 {
     uint8_t bytes[1];
 
-    fread(bytes, 1, 1, file);
+    std::fread(bytes, 1, 1, file);
     return bytes[0];
 }
 
 unsigned freadle16(FILE *file)
 {
     uint8_t bytes[2];
 
-    fread(bytes, 2, 1, file);
+    std::fread(bytes, 2, 1, file);
     return (bytes[0]) | (bytes[1] << 8);
 }
 
 unsigned freadle32(FILE *file)
 {
     uint8_t bytes[4];
 
-    fread(bytes, 4, 1, file);
+    std::fread(bytes, 4, 1, file);
     return (bytes[0]) | (bytes[1] << 8) | (bytes[2] << 16) | (bytes[3] << 24);
 }
 
 unsigned freadhe16(FILE *file)
 {
     uint8_t bytes[2];
 
-    fread(bytes, 2, 1, file);
+    std::fread(bytes, 2, 1, file);
     return (bytes[1]) | (bytes[0] << 8);
 }
 
 unsigned freadhe32(FILE *file)
 {
     uint8_t bytes[4];
 
-    fread(bytes, 4, 1, file);
+    std::fread(bytes, 4, 1, file);
     return (bytes[3]) | (bytes[2] << 8) | (bytes[1] << 16) | (bytes[0] << 24);
 }
 
-
+}

src/bme/bme_end.h

@@ -1,3 +1,13 @@
+
+#ifndef BME_END_H
+#define BME_END_H
+
+#include <cstdio>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void fwrite8(FILE *file, unsigned data);
 void fwritele16(FILE *file, unsigned data);
 void fwritele32(FILE *file, unsigned data);
@@ -6,3 +16,9 @@ unsigned freadle16(FILE *file);
 unsigned freadle32(FILE *file);
 unsigned freadhe16(FILE *file);
 unsigned freadhe32(FILE *file);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif