Matej Kenda
2012-09-04 08:26:45 UTC
Hi Duncan,
Please find a patch at the bottom of thi e-mail that I needed to apply
when compiling in MSYS shell 1.0 with MinGW (gcc 4.7).
Patch applies to latest source of omniORB from branch 4_1.
Regads,
Matej Kenda
Index: src/services/mklib/dynstublib/dir.mk
===================================================================
--- src/services/mklib/dynstublib/dir.mk (revision 6112)
+++ src/services/mklib/dynstublib/dir.mk (working copy)
@@ -73,10 +73,15 @@
MDFLAGS += -p shared/
ifdef Win32Platform
+ifndef MinGW32Build
# in case of Win32 lossage:
dynimps := COS$(OMNIORB_MAJOR_VERSION)$(OMNIORB_MINOR_VERSION)$(OMNIORB_MICRO_VERSION)_rt.lib
\
$(patsubst
$(DLLDebugSearchPattern),$(DLLNoDebugSearchPattern), $(OMNIORB_LIB))
else
+dynimps := -lCOS$(OMNIORB_MAJOR_VERSION)$(OMNIORB_MINOR_VERSION)$(OMNIORB_MICRO_VERSION)_rt
\
+ $(patsubst
$(DLLDebugSearchPattern),$(DLLNoDebugSearchPattern), $(OMNIORB_LIB))
+endif
+else
dynimps := -lCOS$(OMNIORB_MAJOR_VERSION) $(OMNIORB_LIB)
endif
@@ -150,8 +155,13 @@
dynsknamespec = $(subst ., ,$(COS_DYNSKLIB_NAME).$(shareddbugversion))
dynskshareddbug = shareddebug/$(shell $(SharedLibraryDebugFullName)
$(dynsknamespec))
+ifndef MinGW32Build
dbugimps := COS$(OMNIORB_MAJOR_VERSION)$(OMNIORB_MINOR_VERSION)$(OMNIORB_MICRO_VERSION)_rtd.lib
\
$(patsubst
$(DLLNoDebugSearchPattern),$(DLLDebugSearchPattern), $(OMNIORB_LIB))
+else
+dbugimps := -lCOS$(OMNIORB_MAJOR_VERSION)$(OMNIORB_MINOR_VERSION)$(OMNIORB_MICRO_VERSION)_rtd
\
+ $(patsubst
$(DLLNoDebugSearchPattern),$(DLLDebugSearchPattern), $(OMNIORB_LIB))
+endif
MDFLAGS += -p shareddebug/
Please find a patch at the bottom of thi e-mail that I needed to apply
when compiling in MSYS shell 1.0 with MinGW (gcc 4.7).
Patch applies to latest source of omniORB from branch 4_1.
Regads,
Matej Kenda
Index: src/services/mklib/dynstublib/dir.mk
===================================================================
--- src/services/mklib/dynstublib/dir.mk (revision 6112)
+++ src/services/mklib/dynstublib/dir.mk (working copy)
@@ -73,10 +73,15 @@
MDFLAGS += -p shared/
ifdef Win32Platform
+ifndef MinGW32Build
# in case of Win32 lossage:
dynimps := COS$(OMNIORB_MAJOR_VERSION)$(OMNIORB_MINOR_VERSION)$(OMNIORB_MICRO_VERSION)_rt.lib
\
$(patsubst
$(DLLDebugSearchPattern),$(DLLNoDebugSearchPattern), $(OMNIORB_LIB))
else
+dynimps := -lCOS$(OMNIORB_MAJOR_VERSION)$(OMNIORB_MINOR_VERSION)$(OMNIORB_MICRO_VERSION)_rt
\
+ $(patsubst
$(DLLDebugSearchPattern),$(DLLNoDebugSearchPattern), $(OMNIORB_LIB))
+endif
+else
dynimps := -lCOS$(OMNIORB_MAJOR_VERSION) $(OMNIORB_LIB)
endif
@@ -150,8 +155,13 @@
dynsknamespec = $(subst ., ,$(COS_DYNSKLIB_NAME).$(shareddbugversion))
dynskshareddbug = shareddebug/$(shell $(SharedLibraryDebugFullName)
$(dynsknamespec))
+ifndef MinGW32Build
dbugimps := COS$(OMNIORB_MAJOR_VERSION)$(OMNIORB_MINOR_VERSION)$(OMNIORB_MICRO_VERSION)_rtd.lib
\
$(patsubst
$(DLLNoDebugSearchPattern),$(DLLDebugSearchPattern), $(OMNIORB_LIB))
+else
+dbugimps := -lCOS$(OMNIORB_MAJOR_VERSION)$(OMNIORB_MINOR_VERSION)$(OMNIORB_MICRO_VERSION)_rtd
\
+ $(patsubst
$(DLLNoDebugSearchPattern),$(DLLDebugSearchPattern), $(OMNIORB_LIB))
+endif
MDFLAGS += -p shareddebug/