2015/03/03 19:10

 * [libintel64asm] Support clang compiler for Makefile

diff --git a/drcc/Makefile b/drcc/Makefile
index 082fe8f..3cdfe73 100644 (file)
--- a/drcc/Makefile
+++ b/drcc/Makefile
@@ -36,7 +36,7 @@
 
 # Section 1 : Setting Build Command ####################################
 MAKE = make
-CC = gcc
+CC = cc
 
 
 SUPER_HEADER = ../include/drd64_conf.h \
@@ -55,6 +55,8 @@ DRCC_OBJS = \
                drcc_menubar.o \
                drcc_statusbar.o \
                drcc_cmdbar.o \
+               drcc_edittext.o \
+               drcc_filetype.o \
                drcc_winctrl.o
 DRCC_HEADER = \
                drcc.h \
@@ -65,6 +67,8 @@ DRCC_HEADER = \
                drcc_statusbar.h \
                drcc_cmdbar.h \
                drcc_winctrl.h \
+               drcc_edittext.h \
+               drcc_filetype \
                $(SUPER_HEADER)
 
 
@@ -94,6 +98,12 @@ drcc_cmdbar.o: drcc_cmdbar.c
 drcc_winctrl.o: drcc_winctrl.c
        $(CC) -c -o drcc_winctrl.o $(FLAGS_DEBUG) \
                                drcc_winctrl.c
+drcc_edittext.o: drcc_edittext.c
+       $(CC) -c -o drcc_edittext.o $(FLAGS_DEBUG) \
+                               drcc_edittext.c
+drcc_filetype.o: drcc_filetype.c
+       $(CC) -c -o drcc_filetype.o $(FLAGS_DEBUG) \
+                               drcc_filetype.c
        
 $(DRCC_TARGET): $(DRCC_OBJS)
        $(CC) -o $(DRCC_TARGET) $(FLAGS_DEBUG) $(DRCC_OBJS) -lncurses

diff --git a/drcc/drcc.h b/drcc/drcc.h
index 8114fce..4ca760f 100644 (file)
--- a/drcc/drcc.h
+++ b/drcc/drcc.h
@@ -38,7 +38,10 @@ Comment:
 #define DRD64_HEADER_DRCC_INCLUDE
 
 #include<stdio.h>
-
+#include<stdlib.h>
+#include<assert.h>
+#include<sys/types.h>
+#include<sys/stat.h>
 #include<ncurses.h>
 
 #include"../include/drd64_types.h"
@@ -46,7 +49,6 @@ Comment:
 #include"../include/drd64_error.h"
 #include"../include/drd64_conf.h"
 
-#include"drcc.h"
 #include"drcc_main.h"
 #include"drcc_init.h"
 #include"drcc_term.h"
@@ -54,6 +56,8 @@ Comment:
 #include"drcc_menubar.h"
 #include"drcc_statusbar.h"
 #include"drcc_cmdbar.h"
+#include"drcc_edittext.h"
+#include"drcc_filetype.h"
 
 #endif /* DRD64_HEADER_DRCC_INCLUDE */
 

diff --git a/libintel64asm/Makefile b/libintel64asm/Makefile
index d2ea9c5..a0179ce 100644 (file)
--- a/libintel64asm/Makefile
+++ b/libintel64asm/Makefile
@@ -1,4 +1,4 @@
-
+CC = cc
 FLAGS_DEBUG = -g
 LIBINTEL64ASM_LIB =    libintel64asm.a
 LIBINTEL64ASM_OBJS =   drd64_intel64_db.o \
@@ -28,10 +28,10 @@ INTEL64ASM_OBJS = intel64asm.o
 all:   $(LIBINTEL64ASM_LIB) $(INTEL64ASM_TARGET)
 
 $(INTEL64ASM_TARGET): $(INTEL64ASM_OBJS) $(LIBINTEL64ASM_LIB)
-       gcc -o $(INTEL64ASM_TARGET) $(INTEL64ASM_OBJS) $(LIBINTEL64ASM_LIB)
+       $(CC) -o $(INTEL64ASM_TARGET) $(INTEL64ASM_OBJS) $(LIBINTEL64ASM_LIB)
 
 $(INTEL64ASM_OBJS): intel64asm.c ../include/libintel64asm.h
-       gcc -c -o $(INTEL64ASM_OBJS) $(FLAGS_DEBUG) intel64asm.c
+       $(CC) -c -o $(INTEL64ASM_OBJS) $(FLAGS_DEBUG) intel64asm.c
 
 $(LIBINTEL64ASM_LIB): $(LIBINTEL64ASM_OBJS)
        ar rv $(LIBINTEL64ASM_LIB) $(LIBINTEL64ASM_OBJS)
@@ -39,37 +39,37 @@ $(LIBINTEL64ASM_LIB): $(LIBINTEL64ASM_OBJS)
        cp $(LIBINTEL64ASM_LIB) ..
 
 drd64_intel64_function.o: drd64_intel64_function.c $(LIBINTEL64ASM_HEADERS)
-       gcc -c -o drd64_intel64_function.o $(FLAGS_DEBUG) drd64_intel64_function.c
+       $(CC) -c -o drd64_intel64_function.o $(FLAGS_DEBUG) drd64_intel64_function.c
 
 drd64_intel64_db.o: drd64_intel64_db.c  $(LIBINTEL64ASM_HEADERS)
-       gcc -c -o drd64_intel64_db.o $(FLAGS_DEBUG) drd64_intel64_db.c
+       $(CC) -c -o drd64_intel64_db.o $(FLAGS_DEBUG) drd64_intel64_db.c
 
 drd64_intel64_disasm.o: drd64_intel64_disasm.c $(LIBINTEL64ASM_HEADERS)
-       gcc -c -o drd64_intel64_disasm.o $(FLAGS_DEBUG) drd64_intel64_disasm.c
+       $(CC) -c -o drd64_intel64_disasm.o $(FLAGS_DEBUG) drd64_intel64_disasm.c
 
 drd64_intel64_asm.o: drd64_intel64_asm.c $(LIBINTEL64ASM_HEADERS)
-       gcc -c -o drd64_intel64_asm.o $(FLAGS_DEBUG) drd64_intel64_asm.c
+       $(CC) -c -o drd64_intel64_asm.o $(FLAGS_DEBUG) drd64_intel64_asm.c
 
 drd64_intel64_debug.o: drd64_intel64_debug.c $(LIBINTEL64ASM_HEADERS)
-       gcc -c -o drd64_intel64_debug.o $(FLAGS_DEBUG) drd64_intel64_debug.c
+       $(CC) -c -o drd64_intel64_debug.o $(FLAGS_DEBUG) drd64_intel64_debug.c
 
 drd64_intel64_asm_system.o: drd64_intel64_asm_system.c $(LIBINTEL64ASM_HEADERS)
-       gcc -c -o drd64_intel64_asm_system.o $(FLAGS_DEBUG) drd64_intel64_asm_system.c
+       $(CC) -c -o drd64_intel64_asm_system.o $(FLAGS_DEBUG) drd64_intel64_asm_system.c
 
 drd64_intel64_common.o: drd64_intel64_common.c $(LIBINTEL64ASM_HEADERS)
-       gcc -c -o drd64_intel64_common.o $(FLAGS_DEBUG) drd64_intel64_common.c
+       $(CC) -c -o drd64_intel64_common.o $(FLAGS_DEBUG) drd64_intel64_common.c
 
 drd64_intel64_dbcommon.o: drd64_intel64_dbcommon.c $(LIBINTEL64ASM_HEADERS)
-       gcc -c -o drd64_intel64_dbcommon.o $(FLAGS_DEBUG) drd64_intel64_dbcommon.c
+       $(CC) -c -o drd64_intel64_dbcommon.o $(FLAGS_DEBUG) drd64_intel64_dbcommon.c
 
 drd64_intel64_error.o: drd64_intel64_error.c $(LIBINTEL64ASM_HEADERS)
-       gcc -c -o drd64_intel64_error.o $(FLAGS_DEBUG) drd64_intel64_error.c
+       $(CC) -c -o drd64_intel64_error.o $(FLAGS_DEBUG) drd64_intel64_error.c
 
 drd64_intel64_csvcompiler.o: drd64_intel64_csvcompiler.c drd64_intel64_db.h drd64_intel64_dbfile.h
-       gcc -c -o drd64_intel64_csvcompiler.o $(FLAGS_DEBUG) drd64_intel64_csvcompiler.c
+       $(CC) -c -o drd64_intel64_csvcompiler.o $(FLAGS_DEBUG) drd64_intel64_csvcompiler.c
 
 compile: drd64_intel64_csvcompiler.o drd64_intel64_dbcommon.o
-       gcc -o drd64_intel64_csvcompiler drd64_intel64_csvcompiler.o drd64_intel64_dbcommon.o
+       $(CC) -o drd64_intel64_csvcompiler drd64_intel64_csvcompiler.o drd64_intel64_dbcommon.o
        rm -f drd64_intel64db.bin
        ./drd64_intel64_csvcompiler x8664db.csv
 

diff --git a/libintel64asm/drd64_intel64_asm_system.c b/libintel64asm/drd64_intel64_asm_system.c
index a0deb7d..8695fef 100644 (file)
--- a/libintel64asm/drd64_intel64_asm_system.c
+++ b/libintel64asm/drd64_intel64_asm_system.c
@@ -111,7 +111,7 @@ EXTERN int
 {
        i_operandnode_nums      = 0;
        
-       return;
+       return 0x00;
 }
 
 

diff --git a/libintel64asm/drd64_intel64_csvcompiler b/libintel64asm/drd64_intel64_csvcompiler
index 17b5cfa..0c14735 100755 (executable)
Binary files a/libintel64asm/drd64_intel64_csvcompiler and b/libintel64asm/drd64_intel64_csvcompiler differ