Changeset 12c0b5ac in OpenModelica

Timestamp:

2016-04-04T16:59:28+02:00 (8 years ago)

Author:

Adrian Pop <adrian.pop@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

0b73301, b077bcb5

Parents:

56525d3

Message:

adapt to msys2 mingw32/mingw64 - ticket:2578

Location:

OMShell/OMShellGUI

Files:

• Makefile.omdev.mingw (modified) (2 diffs)
• OMShellGUI.pro (modified) (2 diffs)

OMShell/OMShellGUI/Makefile.omdev.mingw

@@ -23 +23 @@
 omc_communication.cc: $(builddir_share)/omc/omc_communication.idl
 ifeq (MINGW32,$(findstring MINGW32,$(shell uname)))
-  $(OMDEV)/lib/omniORB-4.1.6-mingw/bin/x86_win32/omniidl -bcxx -Wbh=.h -Wbs=.cc $<
+  $(OMDEV)/lib/omniORB-4.2.0-mingw32/bin/x86_win32/omniidl -T -bcxx -Wbh=.h -Wbs=.cc -p../../lib/python -Wbdebug $<
 else
   $(OMDEV)/lib/omniORB-4.2.0-mingw64/bin/x86_win32/omniidl -T -bcxx -Wbh=.h -Wbs=.cc -p../../lib/python -Wbdebug $<
@@ -37 +37 @@
   cp -p commands.xml $(builddir_share)/omshell/
   cp -p OMShell_*.qm $(builddir_share)/omshell/nls/
-  cp -puf $(OMDEV)/tools/OMTools/dll/mingwm10.dll $(builddir_bin)
-  cp -puf $(OMDEV)/tools/OMTools/dll/libgcc_s_dw2-1.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 $(OMDEV)/lib/omniORB-4.1.6-mingw/bin/x86_win32/omniORB416_rt.dll $(builddir_bin)
-  cp -puf $(OMDEV)/lib/omniORB-4.1.6-mingw/bin/x86_win32/omnithread34_rt.dll $(builddir_bin)
-  cp -puf $(OMDEV)/lib/pthread/pthreadGC2.dll $(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/QtXml4.dll $(builddir_bin)
   cp -puf ../../common/pre-commit.sh $(shell git rev-parse --git-dir)/hooks/pre-commit
+
+

OMShell/OMShellGUI/OMShellGUI.pro

@@ -26 +26 @@
 # -------For OMNIorb
 win32 {
-  # QMAKE_CXXFLAGS += -fpermissive
   QMAKE_LFLAGS += -Wl,--enable-auto-import
   # win32 vs. win64
@@ -34 +33 @@
   message(uname: $$UNAME)
   count( ISMINGW32, 1 ) {
-    CORBAINC = $$(OMDEV)/lib/omniORB-4.1.6-mingw/include
-    CORBALIBS = -L$$(OMDEV)/lib/omniORB-4.1.6-mingw/lib/x86_win32 -lomniORB416_rt -lomnithread34_rt
+    CORBAINC = $$(OMDEV)/lib/omniORB-4.2.0-mingw32/include
+    CORBALIBS = -L$$(OMDEV)/lib/omniORB-4.2.0-mingw32/lib/x86_win32 -lomniORB420_rt -lomnithread40_rt
     DEFINES += __x86__ \
                __NT__ \