Skip to content
Snippets Groups Projects
Commit 39b486bf authored by Mark Winter's avatar Mark Winter
Browse files

Default enable USE_PROCESS_MUTEX

parent fdc3aa4e
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/c/CudaMex.vcxproj
+ 2
− 2
View file @ 39b486bf
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>.;$(MATLAB_DIR)\extern\include;external</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.;$(MATLAB_DIR)\extern\include;external</AdditionalIncludeDirectories>
<PreprocessorDefinitions>MEX_BUILD;_WINDLL;USE_PROCESS_MUTEX;_CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>MEX_BUILD;USE_PROCESS_MUTEX;_WINDLL;_CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile> <PreprocessToFile>false</PreprocessToFile>
</ClCompile> </ClCompile>
<Link> <Link>
...@@ -77,7 +77,7 @@ copy $(OutDir)CudaMex.dll "$(ProjectDir)Mex.mexw64"</Command> ...@@ -77,7 +77,7 @@ copy $(OutDir)CudaMex.dll "$(ProjectDir)Mex.mexw64"</Command>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>.;$(MATLAB_DIR)\extern\include;external</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.;$(MATLAB_DIR)\extern\include;external</AdditionalIncludeDirectories>
<PreprocessorDefinitions>MEX_BUILD;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>MEX_BUILD;USE_PROCESS_MUTEX;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile> <PreprocessToFile>false</PreprocessToFile>
</ClCompile> </ClCompile>
<Link> <Link>
......
src/c/CudaPy3DLL.vcxproj
+ 2
− 2
View file @ 39b486bf
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>PY_BUILD;WIN32;_DEBUG;_WINDOWS;_USRDLL;CUDAPY3DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>PY_BUILD;USE_PROCESS_MUTEX;WIN32;_DEBUG;_WINDOWS;_USRDLL;CUDAPY3DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.;external;Python;$(PYTHON3_DIR)/include;$(NUMPY3_DIR)/core/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.;external;Python;$(PYTHON3_DIR)/include;$(NUMPY3_DIR)/core/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessToFile>false</PreprocessToFile> <PreprocessToFile>false</PreprocessToFile>
</ClCompile> </ClCompile>
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>PY_BUILD;WIN32;NDEBUG;_WINDOWS;_USRDLL;CUDAPY3DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>PY_BUILD;USE_PROCESS_MUTEX;WIN32;NDEBUG;_WINDOWS;_USRDLL;CUDAPY3DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.;external;Python;$(PYTHON3_DIR)/include;$(NUMPY3_DIR)/core/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.;external;Python;$(PYTHON3_DIR)/include;$(NUMPY3_DIR)/core/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessToFile>false</PreprocessToFile> <PreprocessToFile>false</PreprocessToFile>
</ClCompile> </ClCompile>
......
src/c/makefile
+ 4
− 4
View file @ 39b486bf
...@@ -113,19 +113,19 @@ $(OBJ_DIR)/%.o: Cuda/%.cpp ...@@ -113,19 +113,19 @@ $(OBJ_DIR)/%.o: Cuda/%.cpp
######################################### #########################################
$(OBJ_DIR)/%.o: Mex/%.cpp $(OBJ_DIR)/%.o: Mex/%.cpp
@mkdir -p $(@D) @mkdir -p $(@D)
$(C_COMPILER) $(GCC_FLAGS) -DMEX_BUILD $(MEX_INC) -c $< -o $@ $(C_COMPILER) $(GCC_FLAGS) -DMEX_BUILD -DUSE_PROCESS_MUTEX $(MEX_INC) -c $< -o $@
$(OBJ_DIR)/Mx%.o: ScriptCmds/%.cpp $(OBJ_DIR)/Mx%.o: ScriptCmds/%.cpp
@mkdir -p $(@D) @mkdir -p $(@D)
$(C_COMPILER) $(GCC_FLAGS) -DMEX_BUILD $(MEX_INC) -c $< -o $@ $(C_COMPILER) $(GCC_FLAGS) -DMEX_BUILD -DUSE_PROCESS_MUTEX $(MEX_INC) -c $< -o $@
$(OBJ_DIR)/%.o: Python/%.cpp $(OBJ_DIR)/%.o: Python/%.cpp
@mkdir -p $(@D) @mkdir -p $(@D)
$(C_COMPILER) $(GCC_FLAGS) -DPY_BUILD $(PY_INC) -c $< -o $@ $(C_COMPILER) $(GCC_FLAGS) -DPY_BUILD -DUSE_PROCESS_MUTEX $(PY_INC) -c $< -o $@
$(OBJ_DIR)/Py%.o: ScriptCmds/%.cpp $(OBJ_DIR)/Py%.o: ScriptCmds/%.cpp
@mkdir -p $(@D) @mkdir -p $(@D)
$(C_COMPILER) $(GCC_FLAGS) -DPY_BUILD $(PY_INC) -c $< -o $@ $(C_COMPILER) $(GCC_FLAGS) -DPY_BUILD -DUSE_PROCESS_MUTEX $(PY_INC) -c $< -o $@
######################################### #########################################
# files to clean up # files to clean up
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment