From f8ce6de6e56a7c9d5309360e2d0a3ab82353bfe4 Mon Sep 17 00:00:00 2001
From: sirakaba <sirakaba@9df91469-1e22-0410-86e7-ea8537beb833>
Date: Thu, 19 Nov 2009 13:26:23 +0000
Subject: [PATCH] =?utf8?q?Linux=E3=81=B8=E3=81=AE=E5=AF=BE=E5=BF=9C?=
 =?utf8?q?=E4=BA=88=E5=AE=9A=E3=81=8C=E7=8F=BE=E6=AE=B5=E9=9A=8E=E3=81=A7?=
 =?utf8?q?=E3=81=AF=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7=E3=80=81Linux?=
 =?utf8?q?=E7=94=A8=E3=81=AE=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E5=89=8A?=
 =?utf8?q?=E9=99=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@117 9df91469-1e22-0410-86e7-ea8537beb833
---
 src/plugin/calLibrary/Makefile       | 28 ----------------------------
 src/plugin/calLibrary/calLibrary.cpp | 16 ----------------
 src/plugin/spiLibrary/Makefile       | 29 -----------------------------
 src/plugin/spiLibrary/spiLibrary.cpp |  8 --------
 4 files changed, 81 deletions(-)
 delete mode 100644 src/plugin/calLibrary/Makefile
 delete mode 100644 src/plugin/spiLibrary/Makefile

diff --git a/src/plugin/calLibrary/Makefile b/src/plugin/calLibrary/Makefile
deleted file mode 100644
index f6cb55c..0000000
--- a/src/plugin/calLibrary/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Makefile.
-# $Id: Makefile,v 1.5 2009/08/02 03:41:44 sirakaba Exp $
-
-# Define compilers.
-CC = g++
-CPPFLAGS = -c -O3 -Wall -W -fPIC `wx-config --cppflags`
-LDFLAGS  = -shared -Wl,-Bsymbolic `wx-config --libs` -lwine
-
-# Define i/o files.
-DIR_OBJ  = ../../tmp/calLibrary
-OBJS     = calLibrary.o
-IN_DEF   = ../../common/header/plugin.def
-OUT_LIB  = ../../../bin/lib/calLibrary.so
-
-.PHONY: all clean
-.SUFFIXES: .cpp .o
-
-all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS))
-	$(CC) $(LDFLAGS) -o $(OUT_LIB) -L$(dir $(OUT_LIB)) -Wl,-soname,$(notdir $(OUT_LIB)) $(addprefix $(DIR_OBJ)/,$(OBJS))
-
-clean:
-	rm -f -r $(DIR_OBJ) $(OUT_LIB)
-
-$(DIR_OBJ):
-	mkdir $(DIR_OBJ)
-
-$(DIR_OBJ)/%.o: %.cpp
-	$(CC) $(CPPFLAGS) -o $@ $<
diff --git a/src/plugin/calLibrary/calLibrary.cpp b/src/plugin/calLibrary/calLibrary.cpp
index 33500b3..074f496 100644
--- a/src/plugin/calLibrary/calLibrary.cpp
+++ b/src/plugin/calLibrary/calLibrary.cpp
@@ -55,13 +55,6 @@ bool g_fExistUnicodeMode;
 //    Entry
 //******************************************************************************
 
-#ifdef __LINUX__
-void __attribute__((destructor)) Detach(void)
-{
-	::FreeLibrary(g_LibInfo.hLib);
-	::FreeLibrary(g_LibInfo.hLibAlt);
-}
-#else
 BOOL __stdcall DllMain(HMODULE, DWORD fdwReason, void *)
 {
 	switch (fdwReason)
@@ -72,11 +65,9 @@ BOOL __stdcall DllMain(HMODULE, DWORD fdwReason, void *)
 	}
 	return TRUE;
 }
-#endif
 
 wxDateTime FileTimeToWxDateTime(FILETIME * pft)
 {
-#ifdef __WINDOWS__
 	FILETIME ftLocal;
 	SYSTEMTIME st;
 	if (! ::FileTimeToLocalFileTime(pft, & ftLocal) || ! ::FileTimeToSystemTime(& ftLocal, & st))
@@ -85,9 +76,6 @@ wxDateTime FileTimeToWxDateTime(FILETIME * pft)
 	}
 	wxDateTime dt(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
 	return dt;
-#else
-    return (time_t) 0;
-#endif
 }
 
 //******************************************************************************
@@ -911,11 +899,7 @@ int __stdcall Command
 
 	if (nErrorCode != 0)
 	{
-#ifdef __LINUX__
-		::wxMessageBox(wxString::Format(wxT("Error :\n%x\n\nCommandLine:\n%s\n\nOutput:\n%s"), nErrorCode, szCommandLineSend.c_str(), szOutput.c_str()));
-#else
 		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);
-#endif
 	}
 	return CalErrorCodeConvert(nErrorCode);
 }
diff --git a/src/plugin/spiLibrary/Makefile b/src/plugin/spiLibrary/Makefile
deleted file mode 100644
index d3d1450..0000000
--- a/src/plugin/spiLibrary/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Makefile.
-# $Id: Makefile,v 1.6 2009/08/23 04:25:53 sirakaba Exp $
-
-# Define compilers.
-CC = g++
-CPPFLAGS = -c -O3 -Wall -W -fPIC `wx-config --cppflags`
-LDFLAGS  = -shared -Wl,-Bsymbolic -s `wx-config --libs`
-# -lwinecaller
-
-# Define i/o files.
-DIR_OBJ  = ../../tmp/spiLibrary
-OBJS     = spiLibrary.o ../../common/library/library.o
-IN_DEF   = ../../common/header/plugin.def
-OUT_LIB  = ../../../bin/lib/spiLibrary.so
-
-.PHONY: all clean
-.SUFFIXES: .cpp .o
-
-all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS))
-	$(CC) $(LDFLAGS) -o $(OUT_LIB) -L$(dir $(OUT_LIB)) -Wl,-soname,$(notdir $(OUT_LIB)) $(addprefix $(DIR_OBJ)/,$(OBJS))
-
-clean:
-	rm -f -r $(DIR_OBJ) $(OUT_LIB)
-
-$(DIR_OBJ):
-	mkdir $(DIR_OBJ)
-
-$(DIR_OBJ)/%.o: %.cpp
-	$(CC) $(CPPFLAGS) -o $@ $<
diff --git a/src/plugin/spiLibrary/spiLibrary.cpp b/src/plugin/spiLibrary/spiLibrary.cpp
index d595725..122424c 100644
--- a/src/plugin/spiLibrary/spiLibrary.cpp
+++ b/src/plugin/spiLibrary/spiLibrary.cpp
@@ -43,13 +43,6 @@ TPI_PROC g_prProc;
 //    Entry
 //******************************************************************************
 
-#ifdef __LINUX__
-void __attribute__((destructor)) Detach(void)
-{
-	::FreeLibrary(g_hLib);
-}
-
-#else
 BOOL __stdcall DllMain(HMODULE, DWORD fdwReason, void *)
 {
 	switch (fdwReason)
@@ -60,7 +53,6 @@ BOOL __stdcall DllMain(HMODULE, DWORD fdwReason, void *)
 	}
 	return TRUE;
 }
-#endif
 
 //******************************************************************************
 //    Callback Wrapper
-- 
2.11.0