OpenHSP/Linux/hspcmp

main.cpp
1
--- main.cpp linux
+++ main.cpp windows
@@ -12,11 +12,13 @@
 #include "supio.h"
 
 #include "hsc3.h"
-#include "token.h"
+#include "token.h"
+
+//#define Linux
 
 /*----------------------------------------------------------*/
 
-static void addext( char *st, char *exstr )
+ void addext( char *st, char *exstr )
 {
 	//	add extension of filename
 
@@ -40,8 +42,12 @@
 	b=-1;
 	len=strlen(bname);
 	for(a=0;a<len;a++) {
-		a1=bname[a];
-		if (a1=='\\') b=a;
+		a1=bname[a];
+#ifdef Linux
+		if (a1=='/') b=a;
+#else
+		if (a1=='\\') b=a;
+#endif
 		if (a1<0) a++; 
 	}
 	if (b<0) return 1;
@@ -89,7 +95,8 @@
 
 	for (b=1;b< argc;b++) {
 		a1=*argv[b];a2=tolower(*(argv[b]+1));
-		if ((a1!='/')&&(a1!='-')) {
+		//if ((a1!='/')&&(a1!='-')) {
+		if ( a1 != '-' ) { 
 			strcpy(fname,argv[b]);
 		} else {
 			switch (a2) {
@@ -120,8 +127,12 @@
 
 	//		call main
 
-	hsc3 = new CHsc3;
-	strcpy( compath,"common\\" );
+	hsc3 = new CHsc3;
+#ifdef Linux
+	strcpy( compath, "common/" );
+#else
+	strcpy( compath,"common\\" );
+#endif
 	hsc3->SetCommonPath( compath );
 
 	st = hsc3->PreProcess( fname, fname2, ppopt, fname );

supio.cpp
1
--- supio.cpp linux
+++ supio.cpp windows
@@ -18,10 +18,19 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
-#include <direct.h>
+//include <direct.h>
 #include <ctype.h>
 
 #include "supio.h"
+
+#define Linux
+#ifdef Linux
+#define _MAX_PATH 256
+#define _MAX_DIR 256
+#define _MAX_EXT 256
+#define _MAX_FNAME 256
+#else
+#endif
 
 //
 //		basic C I/O support
@@ -141,6 +150,29 @@
 	return -1;
 }
 
+void _splitpath2( char *path, char *dir, char *fname, char *ext )
+{
+	char *p, pathtmp[256];
+	int len;
+	
+	strcpy( pathtmp, path );
+	
+	p = strrchr( pathtmp, '.' );
+	if (p != NULL) {
+		len = p - pathtmp;
+		sprintf( ext, "%s", p+1 );
+		memset( pathtmp, 0, strlen(pathtmp));
+		strncpy( pathtmp, path, len );
+	}
+	p = strrchr( pathtmp, '/' );
+	if (p != NULL) {
+		len = p - pathtmp;
+		sprintf( fname, "%s", p+1 );
+		memset( pathtmp, 0, strlen(pathtmp));
+		strncpy( pathtmp, path, len );
+	}
+	sprintf( dir, "%s/", pathtmp );
+}
 
 void getpath( char *src, char *outbuf, int p2 )
 {
@@ -154,8 +186,12 @@
 #ifdef USE_WINDOWS_API
 	p = outbuf;
 	strcpy( stmp, src );
-	if (p2&16) strcase( stmp );
-	_splitpath( stmp, p_drive, p_dir, p_fname, p_ext );
+	if (p2&16) strcase( stmp );
+#ifdef Linux
+	_splitpath2( stmp, p_dir, p_fname, p_ext );
+#else
+	_splitpath( stmp, p_drive, p_dir, p_fname, p_ext );
+#endif
 	strcat( p_drive, p_dir );
 	if ( p2&8 ) {
 		strcpy( stmp, p_fname ); strcat( stmp, p_ext );
@@ -203,7 +239,7 @@
 
 
 /*----------------------------------------------------------*/
-
+/*
 void addext( char *st, char *exstr )
 {
 	//	add extension of filename
@@ -218,7 +254,7 @@
 	st[a1]='.'; st[a1+1]=0;
 	strcat(st,exstr);
 }
-
+*/
 void cutlast( char *st )
 {
 	//	cut last characters

token.cpp/token.h
1
--- token.cpp linux
+++ token.cpp windows
@@ -18,7 +18,9 @@
 #include "strnote.h"
 #include "ahtobj.h"
 
-#define s3size 0x8000
+#define s3size 0x8000
+
+#define Linux
 
 //-------------------------------------------------------------
 //		Routines
@@ -1196,11 +1198,18 @@
 			//		constマクロ展開
 			char *ptr_dval;
 			ptr_dval = lb->GetData2( id );
-			if ( ptr_dval == NULL ) {
-				_itoa( lb->GetOpt(id), cnvstr, 10 );
-			} else {
-				_gcvt( *(CALCVAR *)ptr_dval, 64, cnvstr );
-				//sprintf( cnvstr, "%f", *(CALCVAR *)ptr_dval );
+			if ( ptr_dval == NULL ) {
+#ifdef Linux
+				sprintf( cnvstr, "%d", lb->GetOpt(id) );
+#else
+				_itoa( lb->GetOpt(id), cnvstr, 10 );
+#endif
+			} else {
+#ifdef Linux
+				sprintf( cnvstr, "%f", *(CALCVAR *)ptr_dval );
+#else
+				_gcvt( *(CALCVAR *)ptr_dval, 64, cnvstr );
+#endif
 			}
 			chk = ReplaceLineBuf( str, (char *)vs, cnvstr, 0, NULL );
 			break;
@@ -1957,8 +1966,12 @@
 			macdef->index[prms] = macptr;		// 初期値ポインタの設定
 			type = GetToken();
 			switch(type) {
-			case TK_NUM:
-				_itoa( val, word, 10 );
+			case TK_NUM:
+#ifdef Linux
+				sprintf( word, "%d", val );
+#else
+				_itoa( val, word, 10 );
+#endif
 				break;
 			case TK_DNUM:
 				strcpy( word, (char *)s3 );
@@ -1979,8 +1992,12 @@
 				if ( type != TK_NUM ) {
 					SetError("bad default value");
 					return 6;
-				}
-				_itoa( val, word, 10 );
+				}
+#ifdef Linux
+				sprintf( word, "%d", val );
+#else
+				_itoa( val, word, 10 );
+#endif
 				sprintf( word,"-%d",val );
 				break;
 			default:
@@ -3006,8 +3023,12 @@
 	*errtmp = 0;
 
 	while(1) {
-
-		_itoa( pline, ln_str, 10 );
+
+#ifdef Linux
+		sprintf( ln_str, "%d", pline );
+#else
+		_itoa( pline, ln_str, 10 );
+#endif
 		RegistExtMacro( "__line__", ln_str );			// 行番号マクロを更新
 
 
 		vp = p;
--- token.h linux
+++ token.h windows
@@ -4,12 +4,6 @@
 //
 #ifndef __token_h
 #define __token_h
@@ -4,6 +4,12 @@
 //
 #ifndef __token_h
 #define __token_h
+
+#define Linux
+#ifdef Linux
+#define _MAX_PATH 255
+#else
+#endif
 
 // token type
 #define TK_NONE 0

1
# Makefile for hspcmp

# マクロ定義
CC			= gcc
CFLAGS		= -c
#LDFLAGS	=
OPT			= -lstdc++
TARGET		= hspcmp
OBJS		= ahtmodel.o ahtobj.o codegen.o comutil.o errormsg.o hsc3.o \
				hspcmd.o label.o localinfo.o main.o membuf.o strnote.o \
				supio.o tagstack.o token.o

# 生成規則
$(TARGET): $(OBJS)
	$(CC) -o $@ $(OBJS) $(OPT)

.c.o:
	$(CC) $(CFLAGS) $< $(OPT)

ahtmodel.h: membuf.h
ahtobj.h: membuf.h ahtmodel.h


ahtmodel.o: supio.h ahtmodel.h
ahtobj.o: supio.h strnote.h ahtobj.h
codegen.o: supio.h token.h label.h tagstack.h membuf.h strnote.h \
			comutil.h ../hsp3/hsp3debug.h ../hsp3/hsp3struct.h errormsg.h
comutil.o: comutil.h
errormsg.o: ../hsp3/hsp3config.h hsc3.h errormsg.h
hsc3.o: ../hsp3/hsp3config.h ../hsp3/hsp3debug.h ../hsp3/hsp3struct.h supio.h \

			hsc3.h membuf.h strnote.h label.h token.h localinfo.h
#hspcmd.o:
label.o: label.h
localinfo.o: localinfo.h
main.o: supio.h hsc3.h token.h
membuf.o: membuf.h
strnote.o: strnote.h
supio.o: supio.h
tagstack.o: tagstack.h
token.o: supio.h token.h label.h tagstack.h membuf.h strnote.h ahtobj.h