Fixed copying of libqjson.

OpenModelica · Jul 30, 2015 · ec32bc2 · ec32bc2
1 parent 54e8a06
commit ec32bc2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Makefile.omdev.mingw b/Makefile.omdev.mingw
@@ -34,5 +34,7 @@ qjson-build:
 	(cd qjson/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -D CMAKE_AR:String="$(AR)" .. -G $(CMAKE_TARGET) -DCMAKE_INSTALL_PREFIX:PATH=`pwd`)
 	test -f qjson/build/lib/libqjson$(SHREXT) || $(MAKE) -C qjson/build install
 	cp -a qjson/build/lib/libqjson*$(SHREXT)* $(OMBUILDDIR)/lib/omc/
+	cp -a qjson/build/bin/libqjson*$(SHREXT)* $(OMBUILDDIR)/lib/omc/
+	cp -a qjson/build/lib/libqjson*$(SHREXT)* $(OMBUILDDIR)/bin/
 	cp -a qjson/build/bin/libqjson*$(SHREXT)* $(OMBUILDDIR)/bin/
 	cp -a qjson/src/*.h qjson/build/include/qjson
diff --git a/OMEdit/OMEditGUI/Makefile.omdev.mingw b/OMEdit/OMEditGUI/Makefile.omdev.mingw
@@ -21,7 +21,6 @@ install: build Resources/nls/qm.stamp
 	cp -puf $(OMDEV)/tools/OMTools/dll/mingwm10.dll $(builddir_bin)
 	cp -puf $(OMDEV)/tools/mingw/bin/libintl-8.dll $(builddir_bin)
 	cp -puf $(OMDEV)/tools/mingw/bin/libiconv-2.dll $(builddir_bin)
-	cp -puf ../../qjson/build/lib/libqjson*$(SHREXT)* $(builddir_bin)
 	cp -puf $(OMDEV)/tools/OMTools/dll/QtCore4.dll $(builddir_bin)
 	cp -puf $(OMDEV)/tools/OMTools/dll/QtGui4.dll $(builddir_bin)
 	cp -puf $(OMDEV)/tools/OMTools/dll/QtNetwork4.dll $(builddir_bin)