Changeset 627bacf in OpenModelica
- Timestamp:
- 2022-05-16T11:15:02+02:00 (23 months ago)
- Branches:
- maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, master
- Children:
- caa3fcca
- Parents:
- 520e4d0b
- git-author:
- Mahder Gebremedhin <mahge@…> (05/16/22 11:15:02)
- git-committer:
- GitHub <noreply@…> (05/16/22 11:15:02)
- Location:
- OMCompiler
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
OMCompiler/3rdParty
- Property commit changed from 0321aa8528eb7d2a954f406c796087a64d365083 to af9b79766959e92cd3e996da37c50d9226b28ae0
-
OMCompiler/Compiler/Util/Autoconf.mo.omdev.mingw
r395c1164 r627bacf 19 19 " -lsundials_sunlinsoldense -lsundials_sunlinsolklu -lsundials_sunlinsollapackdense -lsundials_sunlinsolspbcgs -lsundials_sunlinsolspfgmr -lsundials_sunlinsolspgmr -lsundials_sunlinsolsptfqmr -lsundials_sunnonlinsolnewton" + 20 20 " -lsundials_cvode -lsundials_cvodes -lsundials_idas -lsundials_kinsol"; 21 constant String ldflags_basic = linkType + "-lomcgc-lregex -ltre -lintl -liconv -lexpat -static-libgcc -luuid -loleaut32 -lole32 -limagehlp -lws2_32 -llis" +21 constant String ldflags_basic = " -lomcgc " + linkType + "-lregex -ltre -lintl -liconv -lexpat -static-libgcc -luuid -loleaut32 -lole32 -limagehlp -lws2_32 -llis" + 22 22 ldflags_sundials + 23 23 ldflags_suitesparse + -
OMCompiler/Makefile.common
rd77d5a5 r627bacf 145 145 146 146 boehm-gc: boehm-gc-lib $(OMBUILDDIR)/include/omc/c/gc.h $(OMBUILDDIR)/include/omc/c/gc_config_macros.h $(OMBUILDDIR)/include/omc/c/gc_version.h $(OMBUILDDIR)/include/omc/c/gc_pthread_redirects.h 147 $( OMBUILDDIR)/$(LIB_OMC)/libomcgc.a: 3rdParty/gc/.libs/libomcgc.a147 $(builddir_bin)/libomcgc-1.dll: 3rdParty/gc/.libs/libomcgc-1.dll 148 148 cp -p $< $@ 149 3rdParty/gc/.libs/libomcgc.a: 3rdParty/gc/Makefile 149 cp -p 3rdParty/gc/.libs/libomcgc.dll.a $(builddir_lib)/omc/libomcgc.dll.a 150 3rdParty/gc/.libs/libomcgc-1.dll: 3rdParty/gc/Makefile 150 151 $(MAKE) -C 3rdParty/gc/ libomcgc.la 151 152 $(OMBUILDDIR)/include/omc/c/gc.h: 3rdParty/gc/include/gc.h … … 158 159 cp -pPR $< $@ 159 160 3rdParty/gc/Makefile: 3rdParty/gc/configure.ac 160 (cd 3rdParty/gc && mkdir -p m4 libatomic_ops/m4 && autoreconf -vif && automake --add-missing && ./configure --prefix="`pwd`" "--host=$(host)" $(LIBGC_EXTRA_CONFIGURATION) --enable-s tatic --disable-gcj-support --disable-java-finalization --enable-large-config CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -DLARGE_CONFIG -DTHREAD_LOCAL_ALLOC")161 (cd 3rdParty/gc && mkdir -p m4 libatomic_ops/m4 && autoreconf -vif && automake --add-missing && ./configure --prefix="`pwd`" "--host=$(host)" $(LIBGC_EXTRA_CONFIGURATION) --enable-shared --disable-static --disable-gcj-support --disable-java-finalization --enable-large-config CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -DLARGE_CONFIG -DTHREAD_LOCAL_ALLOC") 161 162 162 163 ipopt: -
OMCompiler/Makefile.omdev.mingw
rd77d5a5 r627bacf 328 328 (time $(MAKE) -f $(defaultMakefileTarget) CFLAGS="$(CFLAGS)" omc-bootstrapped OMBUILDDIR=$(OMBUILDDIR)) 329 329 330 boehm-gc-lib: $( OMBUILDDIR)/$(LIB_OMC)/libomcgc.a330 boehm-gc-lib: $(builddir_bin)/libomcgc-1.dll 331 331 332 332 -
OMCompiler/SimulationRuntime/c/Makefile.common
raf03d959 r627bacf 197 197 $(CC) -shared -o $@ $(BASE_OBJS) $(GCOBJPATH_MINIMAL) $(LDFLAGS) 198 198 199 libOpenModelicaRuntimeC.dll: $(BASE_OBJS) Makefile.objs 200 @rm -f $@ 201 $(CC) -shared -o $@ $(BASE_OBJS) $(LDFLAGS) -L$(OMBUILDDIR)/lib/omc -lomcgc -ldbghelp -lregex -Wl,--export-all-symbols,--out-implib,$@.a 202 199 203 libOpenModelicaRuntimeC.dylib: $(BASE_OBJS) $(GCOBJPATH_MINIMAL) Makefile.objs 200 204 @rm -f $@ … … 271 275 272 276 bootstrap-dependencies: $(LIBRUNTIME) 277 ifeq (MINGW,$(findstring MINGW,$(shell uname))) 278 cp -p $(LIBRUNTIME) $(builddir_bin) 279 # copy the import (dll.a) lib as well. 280 cp -p $(LIBRUNTIME).a $(builddir_lib) 281 else 273 282 cp -p $(LIBRUNTIME) $(builddir_lib) 283 endif 274 284 # copy header files 275 285 cp -p $(RUNTIME_HEADERS) $(builddir_inc)/c/ -
OMCompiler/SimulationRuntime/c/Makefile.omdev.mingw
raec55cb r627bacf 36 36 CONFIG_H=$(top_builddir)/Compiler/runtime/config.h 37 37 LIBSIMULATION=libSimulationRuntimeC.a 38 LIBRUNTIME=libOpenModelicaRuntimeC. a38 LIBRUNTIME=libOpenModelicaRuntimeC.dll 39 39 LIBFMIRUNTIME=libOpenModelicaFMIRuntimeC.a 40 40 CMINPACK_NO_DLL=-DCMINPACK_NO_DLL -
OMCompiler/SimulationRuntime/c/cmake_3.14.cmake
rdf7454a1 r627bacf 88 88 target_link_libraries(SimulationRuntimeC PUBLIC wsock32) 89 89 set_target_properties(SimulationRuntimeC PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS true) 90 endif( WIN32)90 endif(MINGW) 91 91 92 92 if(OM_OMC_ENABLE_IPOPT) -
OMCompiler/omc_config.h
r8529da7 r627bacf 89 89 90 90 /* adrpo: add -loleaut32 as is used by ExternalMedia */ 91 #define DEFAULT_LDFLAGS "-fopenmp -Wl,-Bstatic -lregex -ltre -lintl -liconv -lexpat -l omcgc -lpthread -loleaut32 -limagehlp -lhdf5 -lz -lszip -Wl,-Bdynamic"91 #define DEFAULT_LDFLAGS "-fopenmp -Wl,-Bstatic -lregex -ltre -lintl -liconv -lexpat -lpthread -loleaut32 -limagehlp -lhdf5 -lz -lszip -Wl,-Bdynamic" 92 92 93 93 #define CONFIG_WITH_OPENMP 1
Note: See TracChangeset
for help on using the changeset viewer.