Go back to an older version of coremake for now

Matroska-Org · Apr 27, 2017 · a23b9fe · a23b9fe
1 parent 52a9c3d
commit a23b9fe
Show file tree

Hide file tree

Showing 25 changed files with 1,101 additions and 2,535 deletions.
diff --git a/corec/tools/coremake/SciTE.properties b/corec/tools/coremake/SciTE.properties
diff --git a/corec/tools/coremake/android_mk.inc b/corec/tools/coremake/android_mk.inc
@@ -76,11 +76,10 @@ IF %(TYPE)==DLL || %(TYPE)==LIB
 
   DIRPUSH ..
   PRINTNL LOCAL_C_INCLUDES := \
-  PRINTNL     %(@&CONFIG_INCLUDE:%= %) \
   FOR EACH USERINCLUDE
       PRINTNL     %(!§NAME) \
   ENDFOR
-  PRINTNL 
+  PRINTNL     %(@&CONFIG_INCLUDE:%= %)
   DIRPOP
   PRINTNL 
 

diff --git a/corec/tools/coremake/automake.inc b/corec/tools/coremake/automake.inc
@@ -111,7 +111,7 @@ FOR EACH ALLDIRS
             ../DEPENDENCIES += %(<NAME).lo
           ENDIF
         ENDFOR
-        FOR EACH HEADER,HEADER_FORCE
+        FOR EACH HEADER
           ../../noinst_HEADERS += %(!NAME)
         ENDFOR
 

diff --git a/corec/tools/coremake/carbide.inc b/corec/tools/coremake/carbide.inc
@@ -66,7 +66,7 @@ FOR EACH LIB,DLL,EXE,CON
   ENDIF
   PRINTNL 	</natures>
   PRINTNL 	<linkedResources>
-  FOR EACH SOURCE,HEADER,HEADER_FORCE
+  FOR EACH SOURCE,HEADER
     IF %(>NAME)!=rss
       PRINTNL 		<link>
       PRINTNL 			<name>%(<NAME).%(>NAME)</name>

diff --git a/corec/tools/coremake/clean.build b/corec/tools/coremake/clean.build
@@ -63,7 +63,6 @@ FOR EACH LIB,DLL,EXE,CON,CAB,LIB_CSHARP,DLL_CSHARP,EXE_CSHARP,CON_CSHARP,EXE_AND
   REMOVE %(�PATH)%(NAME)_rsg.h
   REMOVE %(�PATH)%(NAME).dsp
   REMOVE %(�PATH)%(NAME).vcproj
-  REMOVE %(�PATH)%(NAME).vcxproj
   REMOVE %(�PATH)%(NAME).icproj
   REMOVE %(!ROOTPATH)%(PATH)%(NAME).csproj
   REMOVEDIR %(!ROOTPATH)%(PATH)%(NAME)/obj

diff --git a/corec/tools/coremake/commands.txt b/corec/tools/coremake/commands.txt