Changeset 24200 for lang/c

Timestamp:

11/19/08 05:00:07 (4 years ago)

Author:

saturday06

Message:

sample

Location:

lang/c/libintl-msvc

Files:

• 1.sh (modified) (3 diffs)
• 2.bat (modified) (1 diff)
• iconv.h (moved) (moved from lang/c/libintl-msvc/recipes/iconv.h) (1 prop)
• libintl.h (moved) (moved from lang/c/libintl-msvc/recipes/libintl.h) (1 prop)
• recipes/loadmsgcat-windows.h (modified) (2 diffs)
• recipes/test.c (deleted)
• samples/sample.cpp (modified) (3 diffs)
• samples/sample.vcproj (modified) (1 diff)
• win_iconv.c (moved) (moved from lang/c/libintl-msvc/recipes/win_iconv.c) (1 diff, 1 prop)

lang/c/libintl-msvc/1.sh

@@ -9 +9 @@
 mkdir -p win_iconv/include
 mkdir -p win_iconv/lib
-cp recipes/iconv.h win_iconv/include/
-gcc $CFLAGS -c recipes/win_iconv.c -o win_iconv.o
+cp iconv.h win_iconv/include/
+gcc $CFLAGS -c win_iconv.c -o win_iconv.o
 ar rv win_iconv/lib/libiconv.a win_iconv.o
 
@@ -18 +18 @@
 
 cd recipes/gettext-runtime
-rm -f intl/loadmsgcat.c
+rm -rf intl
 autoreconf -i
 patch --batch --forward -p0 < ../intl.patch
-cp ../loadmsgcat-windows.h intl
+cp ../loadmsgcat-windows.h intl/
 CFLAGS="$CFLAGS" ./configure \
   --with-libiconv-prefix=`pwd`/../../win_iconv \
@@ -29 +29 @@
 make clean
 make
+cp libintl.a ../../../
 gcc $CFLAGS -c tsearch.c -I..
 strip -gx *.o
-cd ../../../
+cd ../../../samples
 
+g++ $CFLAGS -o mingw-sample.exe sample.cpp ../win_iconv.o ../libintl.a -luser32 -lshlwapi
+./mingw-sample
+cd ..
+

lang/c/libintl-msvc/2.bat

@@ -17 +17 @@
 
 REM use win_iconv.c
-cl /Fetest1.exe recipes\test.c libintl.lib recipes\win_iconv.c user32.lib
+cd samples
+cl /Femsvc-sample.exe sample.cpp ..\win_iconv.c user32.lib /EHsc
+msvc-sample
+cd ..
+

lang/c/libintl-msvc/recipes/loadmsgcat-windows.h

@@ -17 +17 @@
   wchar_t* pathname16 = NULL;
   unsigned int num_elements = 0;
-  FILE* f = NULL;
+  int result = 0;
 
   num_elements = MultiByteToWideChar(CP_UTF8, 0, pathname8, -1, NULL, 0);
@@ -34 +34 @@
     }
 
-  f = _wopen(pathname16, flags);
+  result = _wopen(pathname16, flags);
   free(pathname16);
-  return f;
+  return result;
 }
 

lang/c/libintl-msvc/samples/sample.cpp

@@ -20 +20 @@
 #endif
 
-int main() {
+int main(int argc, char** argv) {
     if (setlocale(LC_ALL, "") == NULL) {
         return 1;
@@ -47 +47 @@
         return 1;
     }
-    if (bind_textdomain_codeset(PACKAGE_NAME,"UTF-16LE") == NULL) {
+    if (bind_textdomain_codeset(PACKAGE_NAME, "UTF-16LE") == NULL) {
         return 1;
     }
@@ -56 +56 @@
 #endif
 
-    textdomain(PACKAGE_NAME);
+    if (textdomain(PACKAGE_NAME) == NULL) {
+        return 1;
+    }
 
+    _putts(_("Hello, world!"));
     MessageBox(NULL, _("Hello, world!"), _T("sample"), MB_OK);
+
     return 0;
 }

lang/c/libintl-msvc/samples/sample.vcproj

@@ -181 +181 @@
                         </File>
                         <File
-                                RelativePath="..\win_iconv.c"
+                                RelativePath="..\recipes\win_iconv.c"
                                 >
                         </File>

lang/c/libintl-msvc/win_iconv.c

@@ -698 +698 @@
     if (ConvertINetString != NULL)
         return TRUE;
-    h = LoadLibrary("mlang.dll");
+    h = LoadLibrary(TEXT("mlang.dll"));
     if (!h)
         return FALSE;