Changeset 24509

Timestamp:

11/20/08 22:44:25 (7 weeks ago)

Author:

saturday06

Message:

windows

Location:

lang/c/libintl-msvc

Files:

• 1.sh (modified) (3 diffs)
• 2.bat (modified) (2 diffs)
• recipes/loadmsgcat-windows.h (modified) (1 diff)

lang/c/libintl-msvc/1.sh

@@ -61 +61 @@
   --with-included-gettext \
   --enable-threads=win32 &&
-  cd intl && make clean && make && gcc $CFLAGS_MSVC -c tsearch.c -I..
+  cd intl && make clean && make && gcc $CFLAGS_MSVC -c tsearch.c -I.. && cd ..
+
 for obj in $objlist
 do
   cp -f intl/$obj intl/${obj}bj-mbcs
 done
+
 strip -gx intl/*.obj-mbcs
+
+# ---------------------
+# msvc(UNICODE)
+# ---------------------
+CFLAGS="$CFLAGS_MSVC $CFLAGS_UNICODE" ./configure \
+  --with-libiconv-prefix=`pwd`/../../win_iconv \
+  --with-included-gettext \
+  --enable-threads=win32 &&
+  cd intl && make clean && make && gcc $CFLAGS_MSVC $CFLAGS_UNICODE -c tsearch.c -I.. && cd ..
+for obj in $objlist
+do
+  cp -f intl/$obj intl/${obj}bj
+done
+strip -gx intl/*.obj
 
 # ---------------------
@@ -75 +91 @@
   --with-included-gettext \
   --enable-threads=win32 &&
-  cd intl && make clean && make && cp -f libintl.a ../../../libintl-mbcs.a
-
-# ---------------------
-# msvc(UNICODE)
-# ---------------------
-CFLAGS="$CFLAGS_MSVC $CFLAGS_UNICODE" ./configure \
-  --with-libiconv-prefix=`pwd`/../../win_iconv-mbcs \
-  --with-included-gettext \
-  --enable-threads=win32 &&
-  cd intl && make clean && make && gcc $CFLAGS_MSVC $CFLAGS_UNICODE -c tsearch.c -I..
-for obj in $objlist
-do
-  cp -f intl/$obj intl/${obj}bj
-done
-strip -gx intl/*.obj
+  cd intl && make clean && make && cp -f libintl.a ../../../libintl-mbcs.a && cd ..
 
 # ---------------------
@@ -95 +97 @@
 # ---------------------
 CFLAGS="$CFLAGS $CFLAGS_UNICODE" ./configure \
-  --with-libiconv-prefix=`pwd`/../../win_iconv-mbcs \
+  --with-libiconv-prefix=`pwd`/../../win_iconv \
   --with-included-gettext \
   --enable-threads=win32 &&
-  cd intl && make clean && make && cp -f libintl.a ../../../libintl.a
+  cd intl && make clean && make && cp -f libintl.a ../../../libintl.a && cd ..
 
-cd ../../../samples
+# ---------------------
+# compile test
+# ---------------------
+cd ../../samples
 
 g++ $CFLAGS -o mingw-sample-mbcs.exe sample.cpp ../win_iconv-mbcs.o ../libintl-mbcs.a -luser32 -lshlwapi
 g++ $CFLAGS $CFLAGS_UNICODE -o mingw-sample.exe sample.cpp ../win_iconv.o ../libintl.a -luser32 -lshlwapi
+./mingw-sample-mbcs > hello-mbcs.txt
 ./mingw-sample > hello.txt
 cd ..

lang/c/libintl-msvc/2.bat

@@ -5 +5 @@
 cd recipes\gettext-runtime\intl
 lib /OUT:..\..\..\libintl.lib *.obj
+lib /OUT:..\..\..\libintl-mbcs.lib *.obj-mbcs
 
 cd ..\..\..\
@@ -14 +15 @@
 REM use win_iconv.c
 cd samples
-cl /Femsvc-sample.exe sample.cpp ..\win_iconv.c user32.lib /EHsc
+cl /Femsvc-sample-mbcs.exe sample.cpp ..\win_iconv.c user32.lib /EHsc
+cl /Femsvc-sample.exe sample.cpp ..\win_iconv.c user32.lib /EHsc /DUNICODE  /D_UNICODE
+msvc-sample-mbcs
 msvc-sample
 cd ..

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

@@ -8 +8 @@
 #define LOADMSGCAT_WINDOWS_H 1
 
-#ifdef __MINGW32_VERSION
-#if defined(UNICODE) || defined(_UNICODE)
+#if defined(__MINGW32_VERSION) && (defined(UNICODE) || defined(_UNICODE))
 
 #include <windows.h>