Browse Source

fix file path, remove even

mihawk 8 years ago
parent
commit
9a3c890bd3
1 changed files with 2 additions and 4 deletions
  1. 2 4
      src/compile/mad_port.erl

+ 2 - 4
src/compile/mad_port.erl

@@ -36,12 +36,11 @@ compile_port(Dir,Specs0,Config) ->
                             0 -> {ok,Obj};
                             0 -> {ok,Obj};
                             _ -> {error, "Port Compilation Error:~n" ++ io_lib:format("~ts",[Report])},true
                             _ -> {error, "Port Compilation Error:~n" ++ io_lib:format("~ts",[Report])},true
                            end;
                            end;
-                        true -> {even,Obj}
+                        true -> {ok,Obj}
                        end 
                        end 
                     end,
                     end,
 
 
           Res = lists:foldl(fun({ok,X},Acc)   -> [X|Acc];
           Res = lists:foldl(fun({ok,X},Acc)   -> [X|Acc];
-                               ({event,X},Acc)-> [X|Acc];
                                ({error,Err},_)-> {error,Err} 
                                ({error,Err},_)-> {error,Err} 
                             end,[],[Compile(F) || F <- Files]),
                             end,[],[Compile(F) || F <- Files]),
           case Res of
           case Res of
@@ -94,8 +93,7 @@ link_lang(Files)   -> lists:foldl(fun(F,cxx) -> cxx;
 files(Dir,Patterns)-> files(Dir,Patterns, []).
 files(Dir,Patterns)-> files(Dir,Patterns, []).
 files(_,[], Acc) -> lists:reverse(Acc);
 files(_,[], Acc) -> lists:reverse(Acc);
 files(D,[H|T], Acc) ->
 files(D,[H|T], Acc) ->
-  files(D,T,filelib:wildcard(H)++Acc). 
-  %files(D,T,filelib:wildcard(join(D,H))++Acc). 
+  files(D,T,filelib:wildcard(join(D,H))++Acc). 
 
 
 
 
 target_type(".so")   -> drv;
 target_type(".so")   -> drv;