- YOU WILL NEED A NEW OMDev FOR THIS revision, just do SVN update on OMDev

- moved some binaries from /trunk into OMDev.
  + liblpsolve 
  + libsqlite3
  + liblapack-mingw.a
  + libblas-mingw.a
  + lib/libtmglib-mingw.a


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@9130 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: adrpo

Compiler/BackEnd/SimCode.mo

@@ -8985,8 +8985,9 @@ algorithm
         true = "Windows_NT" ==& System.os();
         str = "-l" +& str;
         strs = getLibraryStringInGccFormat(Absyn.STRING("Lapack"));
-        strs = str :: "-llpsolve55" :: "-lmico2313" :: "-lws2_32" :: "-lregex" :: strs;
-      then strs;
+        strs = str :: "-lsqlite3" :: "-llpsolve55" :: "-lmico2313" :: "-lws2_32" :: "-lregex" :: strs;
+      then 
+        strs;
 
         // The library is not actually named libLapack.so.
         // Which is a problem, since MSL says it does.
@@ -9004,7 +9005,8 @@ algorithm
     case Absyn.STRING(str as "omcruntime")
       equation
         false = "Windows_NT" ==& System.os();
-      then System.getRuntimeLibs();
+      then 
+        System.getRuntimeLibs();
 
         // If the string contains a dot, it's a good path that should not be prefix -l
     case Absyn.STRING(str)

Compiler/Makefile.compiler_subdirs.common

@@ -12,9 +12,6 @@ all : .testvariables .depend $(ALLMO) $(SRCSIGX)
 SUBDIRS	= runtime parser modpar
 SRCHSRCDIR = $(SRCH:%.h=$(srcdir)/%.h)
 
-# Don't link against sqlite until we actually need it -lsqlite3
-SQLITE3=
-
 .SUFFIXES: .o .mo .h .c
 .PHONY: all vctarget absyn_subdir clean reallyclean $(SUBDIRS)
 

Compiler/runtime/Makefile.common

@@ -19,7 +19,7 @@ endif
 RML_COMPAT=$(top_builddir)/c_runtime/meta/rml_compatibility.h
 
 SRC	= RTOpts_rml.c Print_rml.c System_rml.c Settings_rml.c \
-  SimulationResults_rml.c IOStreamExt_rml.c Database_rml.c Socket_rml.c sqlite/sqlite3.c
+  SimulationResults_rml.c IOStreamExt_rml.c Database_rml.c Socket_rml.c 
 
 CPPSRC  = unitparser.cpp UnitParserExt_rml.cpp ptolemyio_rml.cpp \
   BackendDAEEXT_rml.cpp ErrorMessage.cpp Error_rml.cpp OptManager_rml.cpp \
@@ -82,4 +82,4 @@ ptolemyio_omc.o : ptolemyio.cpp $(RML_COMPAT)
 ErrorMessage.o : ErrorMessage.cpp ErrorMessage.hpp
 
 clean:
-	$(RM) -rf *.a *.o omc_communication.cc omc_communication.h omc_communication-* sqlite/*.o
+	$(RM) -rf *.a *.o omc_communication.cc omc_communication.h omc_communication-* 

Compiler/runtime/Makefile.in

@@ -24,7 +24,7 @@ CC	= @CC@
 CXX	= @CXX@
 IDL	= @IDLCMD@
 CXXFLAGS = $(CFLAGS)
-CPPFLAGS = -I$(RMLINCLUDE) -I$(top_builddir)/c_runtime -I$(top_builddir)/c_runtime/meta -I$(srcdir) -I. $(CORBAINCL) -Ilpsolve
+CPPFLAGS = -I$(RMLINCLUDE) -I$(top_builddir)/c_runtime -I$(top_builddir)/c_runtime/meta -I$(srcdir) -I. $(CORBAINCL)  
 
 include Makefile.common
 

Compiler/runtime/config.h

@@ -56,7 +56,7 @@
 #define CONFIG_DLL_EXT ".dll"
 #define CONFIG_OS "Windows_NT"
 #define CONFIG_CORBALIBS "-L$(OPENMODELICAHOME)/lib/omc -lmico2313"
-#define CONFIG_LPSOLVEINC "lp_lib.h"
+#define CONFIG_LPSOLVEINC "lpsolve/lp_lib.h"
 /* Windows is always "special" */
 #define CONFIG_SYSTEMLIBS mk_nil()