Changeset 74

Timestamp:

03/23/07 01:18:13 (20 months ago)

Author:

matthiasm

Message:

Added VC6 project file to compile a static library to later link with DyneTK. Linking works. Compiling works, Generating NSOF works and the run on the Newt. For WIN32 I created a very minimal "iconv" replacement which should just be sufficient for some initial tests. Must get back to this though!

Location:

NEWT0/trunk

Files:

• platform/VisualC6/newt_app.dsp (modified) (1 diff)
• platform/VisualC6/newt_lib.dsp (modified) (4 diffs)
• src/newt_core/NewtIconv.c (modified) (1 diff)
• src/newt_core/incs/VC6/config.h (modified) (2 diffs)
• src/newt_core/incs/VC6/iconv.h (added)
• src/newt_core/incs/VC6/stdbool.h (modified) (2 diffs)
• src/newt_core/incs/platform.h (modified) (1 diff)

NEWT0/trunk/platform/VisualC6/newt_app.dsp

@@ -110 +110 @@
 # Begin Source File
 
+SOURCE=..\..\src\newt_core\incs\VC6\iconv.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\newt_core\incs\VC6\stdbool.h
 # End Source File

NEWT0/trunk/platform/VisualC6/newt_lib.dsp

@@ -42 +42 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../src" /I "../../src/newt_core/incs" /I "../../src/newt_core/incs/VC6" /I "../../src/parser" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../src" /I "../../src/newt_core/incs" /I "../../src/newt_core/incs/VC6" /I "../../src/parser" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -65 +65 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../src" /I "../../src/newt_core/incs" /I "../../src/newt_core/incs/VC6" /I "../../src/parser" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../src" /I "../../src/newt_core/incs" /I "../../src/newt_core/incs/VC6" /I "../../src/parser" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -107 +107 @@
 # Begin Source File
 
+SOURCE=..\..\src\newt_core\incs\VC6\iconv.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\newt_core\incs\VC6\stdbool.h
 # End Source File
@@ -330 +334 @@
 
 SOURCE=..\..\src\main.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File

NEWT0/trunk/src/newt_core/NewtIconv.c

@@ -69 +69 @@
 }
 
+#if _MSC_VER
+
+#include <string.h>
+
+/*
+ * This is a minimalistic "iconv" version which simply maps into WIN32
+ * native calls (not even at this point!). 
+ * 
+ * Requested conversions are:
+ *  UTF-16BE to UTF-8 and back
+ *  MACROMAN to UTF-8 and back
+ *  where UTF-8 is defined at runtime and could be something else...
+ */
+iconv_t iconv_open(const char *tocode, const char *fromcode)
+{
+  iconv_t mode = 0;
+  if (!tocode || !fromcode)
+    return mode;
+  if (strcmp(fromcode, "UTF-16BE")==0)
+    mode |= 1;
+  if (strcmp(tocode, "UTF-16BE")==0)
+    mode |= 2;
+  //printf("Requested iconv form '%s' to '%s' (our code: %d)\n", fromcode, tocode, mode);
+  return mode;
+}
+
+size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
+{
+  int i, n;
+  const char *s;
+  char *d;
+
+  if (!inbuf || !*inbuf || !outbuf || !*outbuf) 
+    return 0;
+
+  n = *inbytesleft;
+  s = *inbuf;
+  d = *outbuf;
+
+  switch (cd) {
+  case 0:
+  case 3:
+    memmove(*outbuf, *inbuf, n);
+    *inbytesleft -= n;
+    *inbuf += n;
+    *outbytesleft -= n;
+    *outbuf += n;
+    break;
+  case 1: // from 16bit to 8bit
+    for (i=0; i<n; i++) {
+      s++;
+      *d++ = *s++;
+    }
+    *inbytesleft -= 2*n;
+    *inbuf += 2*n;
+    *outbytesleft -= n;
+    *outbuf += n;
+    break;
+  case 2: // from 8bit to 16bit
+    for (i=0; i<n; i++) {
+      *d++ = 0;
+      *d++ = *s++;
+    }
+    *inbytesleft -= n;
+    *inbuf += n;
+    *outbytesleft -= 2*n;
+    *outbuf += 2*n;
+    break;
+  }
+  return 0;
+}
+
+int iconv_close(iconv_t type)
+{
+  return 0;
+}
+
+#endif
+
+
 #endif /* HAVE_LIBICONV */

NEWT0/trunk/src/newt_core/incs/VC6/config.h

@@ -13 +13 @@
 #define CONFIG_H
 
-
 /* �}�N���� */
 #undef HAVE_INTTYPES_H
@@ -23 +22 @@
 #undef HAVE_TERMIOS_H 
 
-#undef HAVE_LIBICONV
+#define HAVE_LIBICONV 1
 #undef HAVE_DLOPEN
 #undef HAVE_MMAP

NEWT0/trunk/src/newt_core/incs/VC6/stdbool.h

@@ -13 +13 @@
 #define _NEWT_VC6_STD_BOOL_H_
 
+#ifndef __cplusplus
+
 typedef __int8 bool;
 static const bool true = 1;
@@ -19 +21 @@
 #endif
 
+#endif
+

NEWT0/trunk/src/newt_core/incs/platform.h

@@ -28 +28 @@
 #endif
 
+#ifndef NEWT_EXPORT
+    #define NEWT_EXPORT
+#endif
+
 
 #endif /* PLATFORM_H */