Skip to content

Commit 8d99136

Browse files
author
Michael Kohn
committed
Namespace all files with their directory name (should fix issues with
file systems that are case-insensitive).
1 parent 6a674a5 commit 8d99136

158 files changed

Lines changed: 401 additions & 436 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11

2-
#JOBJS=$(shell ls *.java | sed 's/\.java/\.class/')
3-
42
default:
3+
@mkdir -p build/api
4+
@mkdir -p build/common
5+
@mkdir -p build/generator
56
@+make -C build
67

78
.PHONY: samples
@@ -57,6 +58,7 @@ javadoc:
5758

5859
clean:
5960
@rm -f *.o java_grinder build/*.o *.asm *.lst *.hex *.prg
61+
@rm -rf build/api build/common build/generator
6062
@rm -f java/*.class samples/*.class build/*.jar
6163
@cd samples && make clean
6264
@cd unit && make clean

api/adc.cxx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
#include <string.h>
1515
#include <stdint.h>
1616

17-
#include "JavaClass.h"
18-
#include "adc.h"
19-
//if (strncmp(#funct#sig, function, sizeof(#funct#sig)-1) == 0)
20-
//if (strncmp(#funct#sig, function, sizeof(#funct#sig)-1) == 0)
17+
#include "api/adc.h"
2118

2219
#define CHECK_FUNC(funct,sig) \
2320
if (strcmp(#funct#sig, function) == 0) \

api/adc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#ifndef _ADC_H
1313
#define _ADC_H
1414

15-
#include "Generator.h"
16-
#include "JavaClass.h"
15+
#include "common/JavaClass.h"
16+
#include "generator/Generator.h"
1717

1818
int adc(JavaClass *java_class, Generator *generator, const char *method_name);
1919
int adc(JavaClass *java_class, Generator *generator, const char *method_name, int const_val);

api/amiga.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
#include <string.h>
1515
#include <stdint.h>
1616

17-
#include "JavaClass.h"
18-
#include "amiga.h"
17+
#include "api/amiga.h"
1918

2019
#define CHECK_FUNC(funct,sig) \
2120
if (strcmp(#funct#sig, method_name) == 0) \

api/amiga.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#ifndef _AMIGA_API_H
1313
#define _AMIGA_API_H
1414

15-
#include "Generator.h"
16-
#include "JavaClass.h"
15+
#include "common/JavaClass.h"
16+
#include "generator/Generator.h"
1717

1818
int amiga(JavaClass *java_class, Generator *generator, const char *method_name);
1919
int amiga(JavaClass *java_class, Generator *generator, const char *method_name, int const_val);

api/appleiigs_.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
#include <string.h>
1515
#include <stdint.h>
1616

17-
#include "JavaClass.h"
18-
#include "appleiigs_.h"
17+
#include "api/appleiigs_.h"
1918

2019
#define CHECK_FUNC(funct,sig) \
2120
if (strcmp(#funct#sig, function) == 0) \

api/appleiigs_.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#ifndef _APPLEIIGS_H
1313
#define _APPLEIIGS_H
1414

15-
#include "Generator.h"
16-
#include "JavaClass.h"
15+
#include "common/JavaClass.h"
16+
#include "generator/Generator.h"
1717

1818
int appleiigs(JavaClass *java_class, Generator *generator, const char *method_name);
1919
int appleiigs(JavaClass *java_class, Generator *generator, const char *method_name, int const_val);

api/atari_2600.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
#include <string.h>
1515
#include <stdint.h>
1616

17-
#include "JavaClass.h"
18-
#include "atari_2600.h"
17+
#include "api/atari_2600.h"
1918

2019
#define CHECK_FUNC(funct,sig) \
2120
if (strcmp(#funct#sig, method_name) == 0) \

api/atari_2600.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#ifndef _ATARI_2600_H
1313
#define _ATARI_2600_H
1414

15-
#include "Generator.h"
16-
#include "JavaClass.h"
15+
#include "common/JavaClass.h"
16+
#include "generator/Generator.h"
1717

1818
int atari_2600(JavaClass *java_class, Generator *generator, const char *method_name);
1919
int atari_2600(JavaClass *java_class, Generator *generator, const char *method_name, int const_val);

api/c64_sid.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
#include <string.h>
1515
#include <stdint.h>
1616

17-
#include "JavaClass.h"
18-
#include "cpu.h"
17+
#include "api/cpu.h"
1918

2019
#define CHECK_FUNC(funct) \
2120
if (strncmp(#funct, function, sizeof(#funct)-1) == 0) \

0 commit comments

Comments
 (0)