Merge pull request #36 from mlund/mega65-subdir

Separate `mega65/` header-directory

.gitignore

@@ -62,7 +62,7 @@ work
 build
 
 # Visual studio code
-.vscode
+.vscode/*
 
 # CMake
 CMakeCache.txt

CMakeLists.txt

@@ -25,18 +25,18 @@ set(objects
     src/time.c)
 
 set(headers
-    include/conio.h
-    include/debug.h
-    include/dirent.h
-    include/fileio.h
-    include/hal.h
-    include/memory.h
-    include/mouse.h
-    include/random.h
-    include/sdcard.h
-    include/targets.h
-    include/tests.h
-    include/time.h)
+    include/mega65/conio.h
+    include/mega65/debug.h
+    include/mega65/dirent.h
+    include/mega65/fileio.h
+    include/mega65/hal.h
+    include/mega65/memory.h
+    include/mega65/mouse.h
+    include/mega65/random.h
+    include/mega65/sdcard.h
+    include/mega65/targets.h
+    include/mega65/tests.h
+    include/mega65/time.h)
 
 set_source_files_properties(${objects} PROPERTIES LANGUAGE C)
 set_source_files_properties(${assembler} PROPERTIES LANGUAGE ASM)
@@ -68,15 +68,15 @@ set(CLANG_WARNINGS
     -Wpedantic # warn if non-standard C/C++ is used
     -Wlanguage-extension-token
 )
-target_compile_options(mega65libc PRIVATE -mcpu=mos65ce02 -Os ${CLANG_WARNINGS})
+target_compile_options(mega65libc PRIVATE -Os ${CLANG_WARNINGS})
 
 # install target
 include(GNUInstallDirs)
 install(TARGETS mega65libc
     EXPORT mega65libc-export
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    PUBLIC_HEADER DESTINATION include
+    PUBLIC_HEADER DESTINATION include/mega65
     )
 install(FILES cmake/mega65libcConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/mega65libc)
 

include/debug.h → include/mega65/debug.h

@@ -3,4 +3,4 @@
 
 void debug_msg(char* m);
 
-#endif // __MEGA65_DEBUG_H
+#endif // __MEGA65_DEBUG_H

include/dirent.h → include/mega65/dirent.h

@@ -15,4 +15,4 @@ struct m65_dirent {
     char d_name[256];
 };
 
-#endif // __MEGA65_DIRENT_H
+#endif // __MEGA65_DIRENT_H

include/fcio.h → include/mega65/fcio.h

@@ -8,7 +8,7 @@
 #ifndef __MEGA65_FCIO_H
 #define __MEGA65_FCIO_H
 
-#include <memory.h>
+#include <mega65/memory.h>
 #include <stdbool.h>
 
 #define FCBUFSIZE 0xff
@@ -521,4 +521,4 @@ void fc_plotExtChar(byte x, byte y, byte c);
  */
 void fc_plotPetsciiChar(byte x, byte y, byte c, byte color, byte exAttr);
 
-#endif // __MEGA65_FCIO_H
+#endif // __MEGA65_FCIO_H

include/fileio.h → include/mega65/fileio.h

@@ -19,4 +19,4 @@ unsigned char chdir(char* filename);
 // Change working directory to the root directory
 unsigned char chdirroot(void);
 
-#endif // __MEGA65_FILEIO_H
+#endif // __MEGA65_FILEIO_H

include/mouse.h → include/mega65/mouse.h

@@ -31,4 +31,4 @@ void mouse_bind_to_sprite(unsigned char sprite_num);
 void mouse_set_bounding_box(
     unsigned short x1, unsigned short y1, unsigned short x2, unsigned short y2);
 
-#endif // __MEGA65_MOUSE_H
+#endif // __MEGA65_MOUSE_H

include/random.h → include/mega65/random.h

@@ -1,8 +1,8 @@
-#include <stdint.h>
-
 #ifndef __MEGA65_RANDOM_H
 #define __MEGA65_RANDOM_H
 
+#include <stdint.h>
+
 uint32_t random32(uint32_t range);
 uint16_t random16(uint16_t range);
 uint8_t random8(uint8_t range);
@@ -11,4 +11,4 @@ uint8_t rand8(uint8_t range);
 uint16_t rand16(uint16_t range);
 uint32_t rand32(uint32_t range);
 
-#endif // __MEGA65_RANDOM_H
+#endif // __MEGA65_RANDOM_H

include/sdcard.h → include/mega65/sdcard.h

@@ -1,4 +1,4 @@
-#include <hal.h>
+#include <mega65/hal.h>
 
 #ifndef __MEGA65_SDCARD_H
 #define __MEGA65_SDCARD_H

src/conio.c

@@ -16,8 +16,8 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <conio.h>
-#include <memory.h>
+#include <mega65/conio.h>
+#include <mega65/memory.h>
 #include <string.h>
 
 #define VIC_BASE 0xD000UL

src/debug.c

@@ -1,4 +1,4 @@
-#include <memory.h>
+#include <mega65/memory.h>
 
 unsigned char the_char;
 void debug_msg(char* m)

src/fat32.c

@@ -1,10 +1,9 @@
+#include <mega65/sdcard.h>
+#include <mega65/hal.h>
+#include <mega65/memory.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <sdcard.h>
-#include <hal.h>
-#include <memory.h>
-
 /*
   Create a file in the root directory of the new FAT32 filesystem
   with the indicated name and size.

src/fcio.c

@@ -25,8 +25,8 @@
 #define __C64__ 1
 #endif
 
-#include <fcio.h>
-#include <memory.h>
+#include <mega65/fcio.h>
+#include <mega65/memory.h>
 #include <c64.h>
 #include <cbm.h>
 #include <stdarg.h>

src/hal.c

@@ -1,5 +1,5 @@
-#include <hal.h>
-#include <memory.h>
+#include <mega65/hal.h>
+#include <mega65/memory.h>
 
 void usleep(uint32_t micros)
 {

src/memory.c

@@ -1,5 +1,5 @@
+#include <mega65/memory.h>
 #include <stdio.h>
-#include <memory.h>
 
 #ifdef __clang__
 volatile struct dmagic_dmalist dmalist;

src/mouse.c

@@ -19,7 +19,8 @@
     Date      2020-07-01
 */
 
-#include <memory.h>
+#include <mega65/memory.h>
+#include <mega65/mouse.h>
 
 unsigned short mouse_min_x = 0;
 unsigned short mouse_min_y = 0;

src/random.c

@@ -9,8 +9,9 @@
 
 */
 
+#include <mega65/memory.h>
+#include <mega65/random.h>
 #include <stdint.h>
-#include <memory.h>
 
 uint32_t random_temp;
 uint8_t random_step;

src/sdcard.c

@@ -1,10 +1,9 @@
+#include <mega65/sdcard.h>
+#include <mega65/hal.h>
+#include <mega65/memory.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <sdcard.h>
-#include <hal.h>
-#include <memory.h>
-
 uint8_t sector_buffer[512];
 
 const long sd_sectorbuffer = 0xffd6e00L;

src/targets.c

@@ -1,6 +1,6 @@
 #include <stdio.h>
-#include <memory.h>
-#include <targets.h>
+#include <mega65/memory.h>
+#include <mega65/targets.h>
 
 unsigned char detect_target(void)
 {

src/tests.c

@@ -1,9 +1,8 @@
-
+#include <mega65/memory.h>
+#include <mega65/tests.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdint.h>
-#include <memory.h>
-#include <tests.h>
 
 unsigned char __tests_out;
 unsigned short __ut_issueNum;

src/time.c

@@ -6,11 +6,11 @@
   that into account.
 */
 
+#include <mega65/memory.h>
+#include <mega65/time.h>
+#include <mega65/targets.h>
+#include <mega65/hal.h>
 #include <stdio.h>
-#include <memory.h>
-#include <time.h>
-#include <targets.h>
-#include <hal.h>
 
 #define I2CDELAY 5000L
 

tests/CMakeLists.txt

@@ -5,7 +5,7 @@ function(TEST NAME)
     add_executable(${NAME} ${NAME}.c)
     target_link_libraries(${NAME} mega65libc)
     set_target_properties(${NAME} PROPERTIES OUTPUT_NAME ${NAME}.prg)
-    target_compile_options(${NAME} PRIVATE -mcpu=mos65ce02 -Os ${CLANG_WARNINGS})
+    target_compile_options(${NAME} PRIVATE -Os ${CLANG_WARNINGS})
     if (XEMU)
         add_test(NAME ${NAME} COMMAND sh -c "${XEMU} ${XEMU_ARGS} -prg ${NAME}.prg")
     endif()

tests/test-memory.c

@@ -9,10 +9,11 @@
  */
 #include <stdlib.h>
 #include <stdio.h>
-#include <memory.h>
+#include <mega65/memory.h>
 
 #define XEMU_CONTROL 0xD6CF
 #define XEMU_QUIT 0x42
+
 void xemu_exit(int exit_code)
 {
     POKE(XEMU_CONTROL, (uint8_t)exit_code);