Merge branch 'master' of https://github.com/OpenModelica/OMShell

OpenModelica · Jun 25, 2015 · ac44689 · ac44689
2 parents 99b004e + 32c1153
commit ac44689
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 506 deletions.
diff --git a/OMShell/OMShellGUI/Makefile.omdev.mingw b/OMShell/OMShellGUI/Makefile.omdev.mingw
@@ -24,7 +24,7 @@ omc_communication.cc: $(builddir_share)/omc/omc_communication.idl
 	$(OMDEV)/lib/omniORB-4.1.6-mingw/bin/x86_win32/omniidl -bcxx -Wbh=.h -Wbs=.cc $<
 omc_communication.h: omc_communication.cc
 
-$(NAME): omc_communication.cc Makefile
+$(NAME): omc_communication.cc omc_communication.h Makefile
 	$(MAKE) -f Makefile
 
 build: $(NAME)

diff --git a/OMShell/OMShellGUI/Makefile.unix.in b/OMShell/OMShellGUI/Makefile.unix.in
@@ -21,7 +21,7 @@ $(NAME): Makefile OMShell.config omc_communication.cc
 
 build: $(NAME)
 	mkdir -p @OMBUILDDIR@/share/omshell/nls/
-	if [ "$(APP)" = ".app" ]; then cp -rp ../bin/$(NAME)$(APP) @OMBUILDDIR@/build/Applications/ ; else cp -p ../bin/$(NAME) @OMBUILDDIR@/bin; fi
+	if [ "$(APP)" = ".app" ]; then cp -rp ../bin/$(NAME)$(APP) @OMBUILDDIR@/Applications/ ; else cp -p ../bin/$(NAME) @OMBUILDDIR@/bin; fi
 	cp -p commands.xml @OMBUILDDIR@/share/omshell/
 	cp -p OMShell_*.qm @OMBUILDDIR@/share/omshell/nls/
 

diff --git a/OMShell/OMShellGUI/omc_communication.cc b/OMShell/OMShellGUI/omc_communication.cc