- Rearrange parmodelica includes to the new include structure.

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

Compiler/Template/CodegenC.tpl

@@ -4012,7 +4012,7 @@ template simulationParModelicaKernelsFile(String filePrefix, list<Function> func
   let()= System.tmpTickResetIndex(0,20) /* parfor index */
 
   <<
-  #include "OCLRuntimeUtil_new.cl"
+  #include <ParModelica/explicit/openclrt/OCLRuntimeUtil.cl>
 
   // ParModelica Parallel Function headers.
   <%functionHeadersParModelica(filePrefix, functions)%>
@@ -4034,7 +4034,7 @@ template functionsParModelicaKernelsFile(String filePrefix, Option<Function> mai
   let()= System.tmpTickResetIndex(0,20) /* parfor index */
 
   <<
-  #include "OCLRuntimeUtil_new.cl"
+  #include <ParModelica/explicit/openclrt/OCLRuntimeUtil.cl>
 
   // ParModelica Parallel Function headers.
   <%functionHeadersParModelica(filePrefix, functions)%>
@@ -4349,7 +4349,7 @@ template commonHeader(String filePrefix)
   #include <errno.h>
   <%if acceptParModelicaGrammar() then
   <<
-  #include <omc_ocl_interface.h>
+  #include <ParModelica/explicit/openclrt/omc_ocl_interface.h>
   /* the OpenCL Kernels file name needed in libOMOCLRuntime.a */
   const char* omc_ocl_kernels_source = "<%filePrefix%>_kernels.cl";
   /* the OpenCL program. Made global to avoid repeated builds */

Makefile.common

@@ -138,11 +138,11 @@ fmiclean:
 
 opencl_rt: 
 ifeq ("$(OPENCL)","Yes")
-	$(MAKE) -C SimulationRuntime/ParModelica/OpenCLRuntime -f $(defaultMakefileTarget)
+	$(MAKE) -C SimulationRuntime/ParModelica/explicit/openclrt -f $(defaultMakefileTarget)
 endif
 
 opencl_rt_clean: 
-	$(MAKE) -C SimulationRuntime/ParModelica/OpenCLRuntime -f $(defaultMakefileTarget) clean
+	$(MAKE) -C SimulationRuntime/ParModelica/explicit/openclrt -f $(defaultMakefileTarget) clean
 
 breakprocess:
 	(cd testsuite/openmodelica/bootstrapping && time g++ BreakProcess.cpp -o BreakProcess -static-libgcc)