Skip to content

Commit

Permalink
- fixed an OMC crash on Vista (sendData.cpp)
Browse files Browse the repository at this point in the history
- added icons for Plot Window (ext.exe) and OMC (omc.exe)
- display the Plot Window (ext.exe) on the taskbar
- updated copyright in OMShell
- added .pdb files for releases: ext.exe, OMShell.exe, omc.exe
  to make it easier to debug crashes
- fixed the last date in OpenModelica System Guide
- fixed 3D_Bouncinball3D.onb
- fixed OMShell runtime error at start



git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@3844 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Feb 5, 2009
1 parent 9714db8 commit c22a455
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Compiler/Makefile.w32
Expand Up @@ -7,7 +7,7 @@
RML=$(OMDEV)\tools\rml\bin\rml
RMLCFLAGS=-Eplain -ftrace
CFLAGS= /Ob2 /Ox /O2 /Ot /Oy /GL /I "./VC7/rmlRuntime/runtime/plain" /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
/D "_MBCS" /FD /EHsc /MT /W3 /nologo /c /TC /wd4311 /wd4312 /Fd"VC7/Release/omcrml.pdb"
/D "_MBCS" /Zi /FD /EHsc /MT /W3 /nologo /c /TC /wd4311 /wd4312 /Fd"VC7/Release/omcrml.pdb"

SRCC= $(SRCMO:.mo=.c)
SRCH= $(SRCMO:.mo=.h)
Expand Down
4 changes: 2 additions & 2 deletions Compiler/runtime/systemimpl.c
Expand Up @@ -367,8 +367,8 @@ RML_BEGIN_LABEL(System__strtok)
free(str);

/* adrpo changed 2004-10-29
rml_prim_once(RML__list_5freverse);
RML_TAILCALLK(rmlSC);
* rml_prim_once(RML__list_5freverse);
* RML_TAILCALLK(rmlSC);
*/
RML_TAILCALLQ(RML__list_5freverse,1);
}
Expand Down
14 changes: 11 additions & 3 deletions c_runtime/sendData/sendData.cpp
Expand Up @@ -61,6 +61,7 @@
//IAEX headers
#include "sendData.h"
#include <sstream>
#include <stdexcept>

#if defined(_MSC_VER) || defined(__MINGW32__)
#define _CRT_SECURE_NO_WARNINGS
Expand Down Expand Up @@ -96,18 +97,25 @@ Connection::~Connection()

const char* Connection::getExternalViewerFileName()
{
char* omdir = getenv("OPENMODELICAHOME");
QString path(omdir);
char* viewerPath = NULL;
string path( getenv( "OPENMODELICAHOME" ) );
if( path.empty() )
throw runtime_error( "Could not find environment variable OPENMODELICAHOME" );
/*
if(path.endsWith("/") || path.endsWith("\\"))
path += "bin/ext";
else
path += "/bin/ext";
*/
path += "/bin/ext";
#ifdef WIN32
path += ".exe";
#elif defined(__APPLE_CC__)
path += ".app";
#endif
return path.toStdString().c_str();
viewerPath = strdup(path.c_str());
// fprintf(stderr, "ViewerPath: %s", viewerPath);
return viewerPath;
}


Expand Down

0 comments on commit c22a455

Please sign in to comment.