File tree Expand file tree Collapse file tree 2 files changed +4
-7
lines changed Expand file tree Collapse file tree 2 files changed +4
-7
lines changed Original file line number Diff line number Diff line change @@ -928,7 +928,7 @@ if (BUILD_CLIENT)
928928    )
929929
930930    # Generate GLSL include files. 
931-     daemon_embed_files("EngineShaders"  "GLSL "  "TEXT"  "client-objects" )
931+     daemon_embed_files("EngineShaders"  "${GLSL_EMBED_DIR} "    " ${GLSL_EMBED_LIST} ""TEXT"  "client-objects" )
932932endif ()
933933
934934if  (BUILD_SERVER)
Original file line number Diff line number Diff line change @@ -67,10 +67,7 @@ macro(daemon_write_buildinfo name)
6767	endforeach ()
6868endmacro ()
6969
70- macro (daemon_embed_files basename slug format targetname)
71- 	set (embed_source_dir "${slug} _EMBED_DIR" )
72- 	set (embed_source_list "${slug} _EMBED_LIST" )
73- 
70+ macro (daemon_embed_files basename dir list format targetname)
7471	set (embed_subdir "${DAEMON_EMBEDDED_SUBDIR} /${basename} " )
7572	set (embed_dir "${DAEMON_GENERATED_DIR} /${embed_subdir} " )
7673
@@ -99,10 +96,10 @@ macro(daemon_embed_files basename slug format targetname)
9996
10097	set (embed_map_text "" )
10198
102- 	foreach (filename ${${embed_source_list} })
99+ 	foreach (filename ${list } )
103100		string (REGEX  REPLACE "[^A-Za-z0-9]"  "_"  filename_symbol "${filename} " )
104101
105- 		set (inpath "${${embed_source_dir} }/${filename} " )
102+ 		set (inpath "${dir } /${filename} " )
106103		set (outpath "${embed_dir} /${filename_symbol}${DAEMON_GENERATED_H_EXT} " )
107104
108105		add_custom_command (
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments