Changeset 982 in svn for trunk

Timestamp:

Feb 26, 2013, 4:51:44 PM (12 years ago)

Author:

Pavel Demin

Message:

attempt to fix compilation on MacOSX

Location:

trunk

Files:

• Makefile.arch (added)
• VERSION (modified) (1 diff)
• genMakefile.tcl (modified) (5 diffs)

trunk/VERSION

@@ -1 @@
-2.0.2
+2.0.4

trunk/genMakefile.tcl

@@ -209 +209 @@
 #
 
--include $(ROOTSYS)/etc/Makefile.arch
--include $(ROOTSYS)/test/Makefile.arch
+include Makefile.arch
 
 ifeq ($(ARCH),macosx64)
 UNDEFOPT = dynamic_lookup
 endif
-
 
 ifneq (,$(findstring macos,$(ARCH)))
@@ -227 +225 @@
 endif
 
-
 SrcSuf = cc
 
@@ -237 +234 @@
 ###
 
-#SHARED = lib/libUtilities.$(DllSuf) lib/libHector.$(DllSuf)
 SHARED = lib/libUtilities.$(DllSuf)
+SHAREDLIB = lib/libUtilities.lib
+
 VERSION=$(shell cat VERSION)
 FOLDER=Delphes_V_$(VERSION)
@@ -274 +272 @@
 ifeq ($(PLATFORM),macosx)
 # We need to make both the .dylib and the .so
-        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
+        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(LIBS)
 ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
 ifeq ($(MACOSX_MINOR),4)
@@ -283 +281 @@
 ifeq ($(PLATFORM),win32)
         @bindexplib $* $^ > $*.def
-        @lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(EVENTLIB)
+        @lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(SHAREDLIB)
         @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(LIBS) $(OutPutOpt)$@
         @$(MT_DLL)
 else
-        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
+        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(LIBS)
         @$(MT_DLL)
 endif