Refs #39. Moved the shared lib (dll) to top directory in MingW64 compiler environment.
This commit is contained in:
		
							parent
							
								
									82f5274828
								
							
						
					
					
						commit
						078bfd0b4f
					
				
							
								
								
									
										2
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										2
									
								
								Makefile
								
								
								
								
							| 
						 | 
					@ -74,7 +74,7 @@ ifeq ($(OSNAME), Darwin)
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
ifeq ($(OSNAME), WINNT)
 | 
					ifeq ($(OSNAME), WINNT)
 | 
				
			||||||
	$(MAKE) -C exports dll
 | 
						$(MAKE) -C exports dll
 | 
				
			||||||
#	-ln -fs $(LIBDLLNAME) libopenblas.dll
 | 
						-ln -fs $(LIBDLLNAME) libopenblas.dll
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
ifeq ($(OSNAME), CYGWIN_NT)
 | 
					ifeq ($(OSNAME), CYGWIN_NT)
 | 
				
			||||||
	$(MAKE) -C exports dll
 | 
						$(MAKE) -C exports dll
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -53,18 +53,19 @@ dyn : $(LIBDYNNAME)
 | 
				
			||||||
zip : dll
 | 
					zip : dll
 | 
				
			||||||
	zip $(LIBZIPNAME) $(LIBDLLNAME) $(LIBNAME)
 | 
						zip $(LIBZIPNAME) $(LIBDLLNAME) $(LIBNAME)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
dll  : libgoto2.dll
 | 
					dll  : ../$(LIBDLLNAME)
 | 
				
			||||||
 | 
					#libgoto2.dll
 | 
				
			||||||
 | 
					
 | 
				
			||||||
dll2 : libgoto2_shared.dll
 | 
					dll2 : libgoto2_shared.dll
 | 
				
			||||||
 | 
					
 | 
				
			||||||
libgoto2.dll : ../$(LIBNAME) libgoto2.def dllinit.$(SUFFIX)
 | 
					../$(LIBDLLNAME) : ../$(LIBNAME) libgoto2.def dllinit.$(SUFFIX)
 | 
				
			||||||
	$(RANLIB) ../$(LIBNAME)
 | 
						$(RANLIB) ../$(LIBNAME)
 | 
				
			||||||
ifeq ($(BINARY32), 1)
 | 
					ifeq ($(BINARY32), 1)
 | 
				
			||||||
	$(DLLWRAP) -o $(@F) --def libgoto2.def \
 | 
						$(DLLWRAP) -o ../$(LIBDLLNAME) --def libgoto2.def \
 | 
				
			||||||
	--entry _dllinit@12 -s dllinit.$(SUFFIX) --dllname $(@F) ../$(LIBNAME) $(FEXTRALIB)
 | 
						--entry _dllinit@12 -s dllinit.$(SUFFIX) --dllname $(@F) ../$(LIBNAME) $(FEXTRALIB)
 | 
				
			||||||
	-lib /machine:i386 /def:libgoto2.def
 | 
						-lib /machine:i386 /def:libgoto2.def
 | 
				
			||||||
else
 | 
					else
 | 
				
			||||||
	$(DLLWRAP) -o $(@F) --def libgoto2.def \
 | 
						$(DLLWRAP) -o ../$(LIBDLLNAME) --def libgoto2.def \
 | 
				
			||||||
	--entry _dllinit    -s dllinit.$(SUFFIX) --dllname $(@F) ../$(LIBNAME) $(FEXTRALIB)
 | 
						--entry _dllinit    -s dllinit.$(SUFFIX) --dllname $(@F) ../$(LIBNAME) $(FEXTRALIB)
 | 
				
			||||||
	-lib /machine:X64 /def:libgoto2.def 
 | 
						-lib /machine:X64 /def:libgoto2.def 
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue