Skip to content

Commit

Permalink
- added -ftrace option to Makefile.w32
Browse files Browse the repository at this point in the history
- used -trace option in corbaimpl.cpp
- updated Compile.bat to work on Vista
- updated c_runtime.vcproj, added meta_modelica.c and meta_modelica.h
- update omc.vcproj
- updated VC7/rmlRuntime/runtime/common/main.c to take in -trace option
- updated VC7/c_runtime.vcproj to take the OMNotebook and OMShell from
  trunk instead of M:\

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2917 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Sep 11, 2007
1 parent 86fdd99 commit b096d8e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Compiler/Makefile.w32
Expand Up @@ -5,7 +5,7 @@
!INCLUDE Makefile.common.w32

RML=$(OMDEV)\tools\rml\bin\rml
RMLCFLAGS=-Eplain #-ftrace
RMLCFLAGS=-Eplain -ftrace
CFLAGS= /Ob2 /Ox /O2 /Og /Ot /Oy /I "./VC7/rmlRuntime/runtime/plain" /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
/D "_MBCS" /FD /EHsc /MT /W3 /nologo /c /Wp64 /TC /wd4311 /wd4312 /Fd"VC7/Release/vc70.pdb"

Expand Down
7 changes: 6 additions & 1 deletion Compiler/runtime/corbaimpl.cpp
Expand Up @@ -264,7 +264,9 @@ RML_BEGIN_LABEL(Corba__waitForCommand)
{
#ifndef NOMICO
while (WAIT_OBJECT_0 != WaitForSingleObject(omc_client_request_event,INFINITE) );


if (rml_trace_enabled)
fprintf(stderr, "Corba.mo (corbaimpl.cpp): received cmd: %s\n", omc_cmd_message);
rmlA0=mk_scon(omc_cmd_message);

WaitForSingleObject(lock,INFINITE); // Lock so no other tread can talk to omc.
Expand Down Expand Up @@ -449,6 +451,9 @@ RML_BEGIN_LABEL(Corba__waitForCommand)
}
omc_waiting = false;
pthread_mutex_unlock(&omc_waitlock);

if (rml_trace_enabled)
fprintf(stderr, "Corba.mo (corbaimpl.cpp): received cmd: %s\n", omc_cmd_message);

rmlA0=mk_scon(omc_cmd_message);
pthread_mutex_lock(&lock); // Lock so no other tread can talk to omc.
Expand Down
4 changes: 2 additions & 2 deletions Compiler/scripts/Compile.bat
Expand Up @@ -6,9 +6,9 @@ set C_INCLUDE_PATH=
set LIBRARY_PATH=
set OLD_PATH=%PATH%
pushd "%OPENMODELICAHOME%\MinGW\bin" >%1.log 2<&1
set PATH=%CD%;%PATH%
set PATH=%CD%;%OPENMODELICAHOME%\MinGW\libexec\gcc\mingw32\3.4.4\;%PATH%
popd
mingw32-make -f %1.makefile >%1.log 2<&1
%OPENMODELICAHOME%\MinGW\bin\mingw32-make -f %1.makefile >%1.log 2<&1
set RESULT=%ERRORLEVEL%
set PATH=%OLD_PATH%
set OLD_PATH=
Expand Down

0 comments on commit b096d8e

Please sign in to comment.