Changeset 14879

Timestamp:

06/30/08 02:23:10 (5 years ago)

Author:

saturday06

Message:

正直にQT4に対応してないって言ってくれＹＯ

Location:

lang/cplusplus/i3

Files:

• am/i3.am (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• m4-local/bnv_have_qt.m4 (deleted)
• m4-local/italc-gw_CHECK_QT.m4 (added)
• sh/allclean.sh (modified) (2 diffs)
• src/Makefile.am (deleted)
• src/Test.cpp (added)

lang/cplusplus/i3/am/i3.am

@@ -52 +52 @@
 else
 # ---------------------------------------
-# Posix
+# Qt
 
-i3_SOURCES   = $(i3_SOURCES_DEFAULT)
+i3_CXXFLAGS_DEFAULT += $(QT_CXXFLAGS)
+
+i3_SOURCES   = $(i3_SOURCES_DEFAULT) \
+src/windows/Windows.cpp \
+src/windows/LibintlUtf16le.cpp \
+src/windows/LibintlUtf16le.h \
+src/windows/InputWindowCore.cpp \
+src/windows/InputWindowCore.h \
+src/windows/CompletionWindowCore.cpp \
+src/windows/CompletionWindowCore.h
+
 i3_CXXFLAGS  = $(i3_CXXFLAGS_DEFAULT) $(i3_CXXFLAGS_RELEASE)
 i3_LDFLAGS   = $(i3_LDFLAGS_DEFAULT) -s
-i3_LDADD     = $(INTLLIBS)
+i3_LDADD     = $(INTLLIBS) $(QT_LDADD) $(QT_LIB_GUI)
 
 endif

lang/cplusplus/i3/configure.ac

@@ -110 +110 @@
 
 # ---------------------------------------
-# OS
+# OS 
+
+gw_CHECK_QT
 
 case "$host_os" in
@@ -119 +121 @@
         use_windows_api=true
         ;;
+    *)
+        ;;
 esac
 
@@ -124 +128 @@
 AC_SUBST(USE_WINDOWS_API)
 
-
 # ---------------------------------------
-AC_CONFIG_FILES([Makefile intl/Makefile po/Makefile.in src/Makefile])
+AC_CONFIG_FILES([Makefile intl/Makefile po/Makefile.in])
 AC_OUTPUT
 

lang/cplusplus/i3/sh/allclean.sh

@@ -13 +13 @@
 
 # autotools generated
-find . -iname ".deps/"    | xargs rm -rf
+find . -iname ".deps"    | xargs rm -rf
 find . -iname "stamp-h1" | xargs rm -f
 find . -iname "Makefile" | xargs rm -f
+find . -regex "\./conf[0-9]+.*" | xargs rm -rf
+rm -f conftest.c
+rm -f confdefs.h
+rm -f conftest.er1
 
 # gch
@@ -48 +52 @@
 rm -f missing
 rm -f .lineno
-
-rm -f conf*.sh
-rm -f conftest.c
-rm -f confdefs.h
-rm -f conftest.er1
-rm -f conf????
-rm -f conf????.file
-rm -f conf????.lnk
-rm -rf conf????.dir/
 
 rm -f *.gcda