Skip to content

Commit

Permalink
- more fixes for MSVC compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrpo
adrpo committed May 12, 2015
1 parent dadc3dc commit 969cb9c
Show file tree
Hide file tree
Showing 10 changed files with 81 additions and 74 deletions.
6 changes: 5 additions & 1 deletion Makefile.omdev.mingw
View file
Expand Up @@ -334,8 +334,12 @@ simulationruntimecmsvc: mkbuilddirs Umfpack_msvc CMinpack_msvc fmil_msvc
# build gc as well, as it is needed for the msvc c runtime
echo 'Build gc (RelWithDebInfo)'
mkdir -p 3rdParty/gc/build_msvc
echo call '"%VS100COMNTOOLS%\\..\\..\\VC\\vcvarsall.bat"' > 3rdParty/gc/build_msvc/build.bat
echo @echo on > 3rdParty/gc/build_msvc/build.bat
echo call '"%VS100COMNTOOLS%\\..\\..\\VC\\vcvarsall.bat"' >> 3rdParty/gc/build_msvc/build.bat
echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ../ -G "NMake Makefiles"' >> 3rdParty/gc/build_msvc/build.bat
echo @echo on >> 3rdParty/gc/build_msvc/build.bat
echo set MAKE= >> 3rdParty/gc/build_msvc/build.bat
echo set MAKEFLAGS= >> 3rdParty/gc/build_msvc/build.bat
echo nmake /f Makefile >> 3rdParty/gc/build_msvc/build.bat
cd 3rdParty/gc/build_msvc && cmd /c build.bat
echo 'Copy the .lib files (needed for compilation) and .pdb files (needed for debugging) to $(OMBUILDDIR)/lib/omc/msvc/'
Expand Down
110 changes: 55 additions & 55 deletions SimulationRuntime/c/CMakeLists.txt
View file
Expand Up @@ -9,7 +9,7 @@ PROJECT(SimulationRuntimeC)

# Global Variables
IF(NOT OMCTRUNCHOME)
SET(OMCTRUNCHOME ${CMAKE_CURRENT_SOURCE_DIR}/../../)
SET(OMCTRUNCHOME ${CMAKE_CURRENT_SOURCE_DIR}/../../../)
ENDIF (NOT OMCTRUNCHOME)

# OMDEV PATH
Expand Down Expand Up @@ -73,8 +73,8 @@ if(MSVC)
endif(MSVC)

# includes
INCLUDE_DIRECTORIES(${OMCTRUNCHOME})
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/3rdParty/gc/include)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/3rdParty/gc/include)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/linearization)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/math-support)
Expand Down Expand Up @@ -124,16 +124,16 @@ MACRO(BUILDMODEL model mo dir Flags CSRC)


# includes
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/linearization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/math-support)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta/gc)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/results)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver/initialization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/util)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/linearization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/math-support)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/meta)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/meta/gc)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation/results)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation/solver)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation/solver/initialization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/util)

# OMDEV PATH
IF(NOT OMDEV)
Expand Down Expand Up @@ -200,17 +200,17 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
SUNDIALS_KINSOL)

# includes
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/linearization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/math-support)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta/gc)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/ModelicaExternalC)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/results)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver/initialization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/util)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/linearization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/math-support)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/meta)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/meta/gc)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/ModelicaExternalC)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation/results)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation/solver)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation/solver/initialization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/util)

INCLUDE_DIRECTORIES(${dir})

Expand Down Expand Up @@ -332,18 +332,18 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
SUNDIALS_KINSOL)

# includes
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/linearization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/math-support)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta/gc)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/ModelicaExternalC)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/results)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver/initialization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/util)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/linearization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/math-support)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/meta)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/meta/gc)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/ModelicaExternalC)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation/results)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation/solver)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation/solver/initialization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/util)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/fmi/export/fmi1)

# OMDEV PATH
IF(NOT OMDEV)
Expand All @@ -357,7 +357,7 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
SET(OMC_MODELNAME ${model})
SET(OMC_MODELDIR ${dir})
# generate model.mos
FIND_FILE(MOSFILE_IN model_fmu.in PATHS ${OMCTRUNCHOME}/c_runtime)
FIND_FILE(MOSFILE_IN model_fmu.in PATHS ${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c)
CONFIGURE_FILE(${MOSFILE_IN} ${dir}/${model}_FMU.mos)

# Variablen fuer openmodelica2sarturis
Expand All @@ -377,9 +377,9 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
# target fuer OM_OUTPUT
ADD_CUSTOM_TARGET(${model}codegen ALL DEPENDS ${OMC_OUTPUT})

SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmu1_model_interface.h
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelFunctions.h
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelTypes.h)
SET(OMC_FMU_CODE ${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/fmi/export/fmi1/fmu1_model_interface.h
${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/fmi/export/fmi1/fmiModelFunctions.h
${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/fmi/export/fmi1/fmiModelTypes.h)

ADD_LIBRARY(${model} SHARED ${OMC_OUTPUT} ${CSRC} ${OMC_FMU_CODE})
TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver meta ModelicaExternalC libexpat initialization lapack_win32_MT)
Expand Down Expand Up @@ -419,18 +419,18 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
SUNDIALS_KINSOL)

# includes
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/linearization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/math-support)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta/gc)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/ModelicaExternalC)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/results)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver/initialization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/util)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/fmi/export)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/linearization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/math-support)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/meta)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/meta/gc)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/ModelicaExternalC)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation/results)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation/solver)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/simulation/solver/initialization)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/c/util)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/fmi/export)

# OMDEV PATH
IF(NOT OMDEV)
Expand Down Expand Up @@ -461,9 +461,9 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
# target fuer OM_OUTPUT
ADD_CUSTOM_TARGET(${model}codegen ALL DEPENDS ${OMC_OUTPUT})

SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmu1_model_interface.h
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelFunctions.h
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelTypes.h)
SET(OMC_FMU_CODE ${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/fmi/export/fmi1/fmu1_model_interface.h
${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/fmi/export/fmi1/fmiModelFunctions.h
${OMCTRUNCHOME}/OMCompiler/SimulationRuntime/fmi/export/fmi1/fmiModelTypes.h)

ADD_DEFINITIONS(/TP ${FMU_MODELNAME}.c)
set_source_files_properties(${OMC_OUTPUT} PROPERTIES LANGUAGE CXX)
Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/c/fmi/CMakeLists.txt
View file
@@ -1,5 +1,5 @@

INCLUDE_DIRECTORIES("${OMCTRUNCHOME}/3rdParty/FMIL/install_msvc/include")
INCLUDE_DIRECTORIES("${OMCTRUNCHOME}/OMCompiler/3rdParty/FMIL/install_msvc/include")

# Quellen und Header
SET(fmi_sources FMI1CoSimulation.c FMI1Common.c FMI1ModelExchange.c FMI2Common.c FMI2ModelExchange.c FMICommon.c)
Expand Down
8 changes: 4 additions & 4 deletions SimulationRuntime/c/simulation/CMakeLists.txt
View file
Expand Up @@ -7,15 +7,15 @@ ADD_SUBDIRECTORY(results)
ADD_SUBDIRECTORY(solver)

# Include Directory of expat
INCLUDE_DIRECTORIES("${OMCTRUNCHOME}/3rdParty/FMIL/ThirdParty/Expat/expat-2.0.1/lib" "${OMCTRUNCHOME}/Compiler/runtime/")
INCLUDE_DIRECTORIES("${OMCTRUNCHOME}/OMCompiler/3rdParty/FMIL/ThirdParty/Expat/expat-2.0.1/lib" "${OMCTRUNCHOME}/OMCompiler/Compiler/runtime/")

# Quellen und Header
SET(simulation_sources
../linearization/linearize.cpp
SET(simulation_sources
../linearization/linearize.cpp
modelinfo.c simulation_info_json.c simulation_input_xml.cpp socket.cpp
options.c simulation_info_xml.c simulation_runtime.cpp)

SET(simulation_headers
SET(simulation_headers
modelinfo.h simulation_info_json.h simulation_input_xml.h socket.h options.h simulation_info_xml.h simulation_runtime.h
../linearization/linearize.h ../simulation_data.h ../omc_inline.h ../util/omc_msvc.h ../openmodelica.h ../openmodelica_func.h)

Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/c/simulation/solver/CMakeLists.txt
View file
Expand Up @@ -3,7 +3,7 @@

ADD_SUBDIRECTORY(initialization)

INCLUDE_DIRECTORIES("${OMCTRUNCHOME}/Compiler/runtime/")
INCLUDE_DIRECTORIES("${OMCTRUNCHOME}/OMCompiler/Compiler/runtime/" "${OMCTRUNCHOME}/build/include/omc/c" "${OMCTRUNCHOME}/build/include/omc/msvc")

# Quellen und Header
SET(solver_sources
Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/c/simulation/solver/initialization/CMakeLists.txt
View file
Expand Up @@ -6,7 +6,7 @@ SET(initialization_sources initialization.c)

SET(initialization_headers initialization.h)

INCLUDE_DIRECTORIES("${OMCTRUNCHOME}/Compiler/runtime/")
INCLUDE_DIRECTORIES("${OMCTRUNCHOME}/OMCompiler/Compiler/runtime/")

# Library util
ADD_LIBRARY(initialization ${initialization_sources} ${initialization_headers})
Expand Down
6 changes: 3 additions & 3 deletions SimulationRuntime/c/util/CMakeLists.txt
View file
Expand Up @@ -13,9 +13,9 @@ SET(util_headers base_array.h boolean_array.h division.h omc_error.h index_spec
../ModelicaUtilities.h)

if(MSVC)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/3rdParty/regex-0.12)
SET(util_sources ${util_sources} ${OMCTRUNCHOME}/3rdParty/regex-0.12/regex.c)
SET(util_headers ${util_headers} ${OMCTRUNCHOME}/3rdParty/regex-0.12/regex.h)
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/OMCompiler/3rdParty/regex-0.12)
SET(util_sources ${util_sources} ${OMCTRUNCHOME}/OMCompiler/3rdParty/regex-0.12/regex.c)
SET(util_headers ${util_headers} ${OMCTRUNCHOME}/OMCompiler/3rdParty/regex-0.12/regex.h)
endif(MSVC)

# Library util
Expand Down
6 changes: 4 additions & 2 deletions SimulationRuntime/c/util/read_matlab4.c
View file
Expand Up @@ -55,7 +55,7 @@ static const char *binTrans_char = "binTrans";
static const char *binNormal_char = "binNormal";

/* strcmp ignore whitespace */
static inline int strcmp_iws(const char *a, const char *b)
static OMC_INLINE int strcmp_iws(const char *a, const char *b)
{
while (*a && *b) {
if (isspace(*a)) {
Expand Down Expand Up @@ -511,6 +511,8 @@ ModelicaMatVariable_t *omc_matlab4_find_var(ModelicaMatReader *reader, const cha
{
ModelicaMatVariable_t key;
ModelicaMatVariable_t *res;
char *dymolaName = NULL;

key.name = (char*) varName;

res = (ModelicaMatVariable_t*)bsearch(&key,reader->allInfo,reader->nall,sizeof(ModelicaMatVariable_t),omc_matlab4_comp_var);
Expand All @@ -523,7 +525,7 @@ ModelicaMatVariable_t *omc_matlab4_find_var(ModelicaMatReader *reader, const cha
key.name = "time";
return (ModelicaMatVariable_t*)bsearch(&key,reader->allInfo,reader->nall,sizeof(ModelicaMatVariable_t),omc_matlab4_comp_var);
}
char *dymolaName = dymolaStyleVariableName(varName);
dymolaName = dymolaStyleVariableName(varName);
if (dymolaName == NULL) {
dymolaName = openmodelicaStyleVariableName(varName);
}
Expand Down
1 change: 1 addition & 0 deletions SimulationRuntime/c/util/read_matlab4.h
View file
Expand Up @@ -33,6 +33,7 @@

#include <stdio.h>
#include <stdint.h>
#include <omc_msvc.h>

typedef struct {
char *name,*descr;
Expand Down
12 changes: 6 additions & 6 deletions SimulationRuntime/cpp/Makefile.omdev.mingw
View file
Expand Up @@ -2,11 +2,11 @@
# Makefile for compilation of OMC using OMDev-mingw
# OMDev-mingw: http://www.ida.liu.se/~adrpo/omc/omdev/

top_builddir = ../../..
builddir_build=$(top_builddir)/build
builddir_bin=$(top_builddir)/build/bin
builddir_lib=$(top_builddir)/build/lib/omc
builddir_inc=$(top_builddir)/build/include/omc
top_builddir = $(OMBUILDDIR)/../
builddir_build=$(OMBUILDDIR)
builddir_bin=$(OMBUILDDIR)/bin
builddir_lib=$(OMBUILDDIR)/lib/omc
builddir_inc=$(OMBUILDDIR)/include/omc

#use this call to use precompiled headers
BUILDTPYE = Release
Expand Down Expand Up @@ -70,7 +70,7 @@ endif


# move folder to build dir
cp -R build_msvc/tmp/* build_msvc/$(builddir_build)
cp -R build_msvc/tmp/* $(builddir_build)


install: runtimeCpp
Expand Down

0 comments on commit 969cb9c

Please sign in to comment.