Linuxへの対応予定が現段階ではないので、Linux用のコードを削除。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@117 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/src/plugin/calLibrary/Makefile b/src/plugin/calLibrary/Makefile
deleted file mode 100644 (file)
index f6cb55c..0000000
--- a/src/plugin/calLibrary/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Makefile.\r
-# $Id: Makefile,v 1.5 2009/08/02 03:41:44 sirakaba Exp $\r
-\r
-# Define compilers.\r
-CC = g++\r
-CPPFLAGS = -c -O3 -Wall -W -fPIC `wx-config --cppflags`\r
-LDFLAGS  = -shared -Wl,-Bsymbolic `wx-config --libs` -lwine\r
-\r
-# Define i/o files.\r
-DIR_OBJ  = ../../tmp/calLibrary\r
-OBJS     = calLibrary.o\r
-IN_DEF   = ../../common/header/plugin.def\r
-OUT_LIB  = ../../../bin/lib/calLibrary.so\r
-\r
-.PHONY: all clean\r
-.SUFFIXES: .cpp .o\r
-\r
-all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS))\r
-       $(CC) $(LDFLAGS) -o $(OUT_LIB) -L$(dir $(OUT_LIB)) -Wl,-soname,$(notdir $(OUT_LIB)) $(addprefix $(DIR_OBJ)/,$(OBJS))\r
-\r
-clean:\r
-       rm -f -r $(DIR_OBJ) $(OUT_LIB)\r
-\r
-$(DIR_OBJ):\r
-       mkdir $(DIR_OBJ)\r
-\r
-$(DIR_OBJ)/%.o: %.cpp\r
-       $(CC) $(CPPFLAGS) -o $@ $<\r

diff --git a/src/plugin/calLibrary/calLibrary.cpp b/src/plugin/calLibrary/calLibrary.cpp
index 33500b3..074f496 100644 (file)
--- a/src/plugin/calLibrary/calLibrary.cpp
+++ b/src/plugin/calLibrary/calLibrary.cpp
@@ -55,13 +55,6 @@ bool g_fExistUnicodeMode;
 //    Entry\r
 //******************************************************************************\r
 \r
-#ifdef __LINUX__\r
-void __attribute__((destructor)) Detach(void)\r
-{\r
-       ::FreeLibrary(g_LibInfo.hLib);\r
-       ::FreeLibrary(g_LibInfo.hLibAlt);\r
-}\r
-#else\r
 BOOL __stdcall DllMain(HMODULE, DWORD fdwReason, void *)\r
 {\r
        switch (fdwReason)\r
@@ -72,11 +65,9 @@ BOOL __stdcall DllMain(HMODULE, DWORD fdwReason, void *)
        }\r
        return TRUE;\r
 }\r
-#endif\r
 \r
 wxDateTime FileTimeToWxDateTime(FILETIME * pft)\r
 {\r
-#ifdef __WINDOWS__\r
        FILETIME ftLocal;\r
        SYSTEMTIME st;\r
        if (! ::FileTimeToLocalFileTime(pft, & ftLocal) || ! ::FileTimeToSystemTime(& ftLocal, & st))\r
@@ -85,9 +76,6 @@ wxDateTime FileTimeToWxDateTime(FILETIME * pft)
        }\r
        wxDateTime dt(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);\r
        return dt;\r
-#else\r
-    return (time_t) 0;\r
-#endif\r
 }\r
 \r
 //******************************************************************************\r
@@ -911,11 +899,7 @@ int __stdcall Command
 \r
        if (nErrorCode != 0)\r
        {\r
-#ifdef __LINUX__\r
-               ::wxMessageBox(wxString::Format(wxT("Error :\n%x\n\nCommandLine:\n%s\n\nOutput:\n%s"), nErrorCode, szCommandLineSend.c_str(), szOutput.c_str()));\r
-#else\r
                MessageBox(NULL, wxString::Format(wxT("Error :\n%x\n\nCommandLine:\n%s\n\nOutput:\n%s"), nErrorCode, szCommandLineSend.c_str(), szOutput.c_str()), NULL, 0);\r
-#endif\r
        }\r
        return CalErrorCodeConvert(nErrorCode);\r
 }\r

diff --git a/src/plugin/spiLibrary/Makefile b/src/plugin/spiLibrary/Makefile
deleted file mode 100644 (file)
index d3d1450..0000000
--- a/src/plugin/spiLibrary/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Makefile.\r
-# $Id: Makefile,v 1.6 2009/08/23 04:25:53 sirakaba Exp $\r
-\r
-# Define compilers.\r
-CC = g++\r
-CPPFLAGS = -c -O3 -Wall -W -fPIC `wx-config --cppflags`\r
-LDFLAGS  = -shared -Wl,-Bsymbolic -s `wx-config --libs`\r
-# -lwinecaller\r
-\r
-# Define i/o files.\r
-DIR_OBJ  = ../../tmp/spiLibrary\r
-OBJS     = spiLibrary.o ../../common/library/library.o\r
-IN_DEF   = ../../common/header/plugin.def\r
-OUT_LIB  = ../../../bin/lib/spiLibrary.so\r
-\r
-.PHONY: all clean\r
-.SUFFIXES: .cpp .o\r
-\r
-all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS))\r
-       $(CC) $(LDFLAGS) -o $(OUT_LIB) -L$(dir $(OUT_LIB)) -Wl,-soname,$(notdir $(OUT_LIB)) $(addprefix $(DIR_OBJ)/,$(OBJS))\r
-\r
-clean:\r
-       rm -f -r $(DIR_OBJ) $(OUT_LIB)\r
-\r
-$(DIR_OBJ):\r
-       mkdir $(DIR_OBJ)\r
-\r
-$(DIR_OBJ)/%.o: %.cpp\r
-       $(CC) $(CPPFLAGS) -o $@ $<\r

diff --git a/src/plugin/spiLibrary/spiLibrary.cpp b/src/plugin/spiLibrary/spiLibrary.cpp
index d595725..122424c 100644 (file)
--- a/src/plugin/spiLibrary/spiLibrary.cpp
+++ b/src/plugin/spiLibrary/spiLibrary.cpp
@@ -43,13 +43,6 @@ TPI_PROC g_prProc;
 //    Entry\r
 //******************************************************************************\r
 \r
-#ifdef __LINUX__\r
-void __attribute__((destructor)) Detach(void)\r
-{\r
-       ::FreeLibrary(g_hLib);\r
-}\r
-\r
-#else\r
 BOOL __stdcall DllMain(HMODULE, DWORD fdwReason, void *)\r
 {\r
        switch (fdwReason)\r
@@ -60,7 +53,6 @@ BOOL __stdcall DllMain(HMODULE, DWORD fdwReason, void *)
        }\r
        return TRUE;\r
 }\r
-#endif\r
 \r
 //******************************************************************************\r
 //    Callback Wrapper\r