From 33358fd38332f71ba772cac447ccac5a221012fb Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 16 Jul 2009 13:32:40 +0200 Subject: [PATCH] fix wmake bug introduced by a9699afbb46a764d05b98276ca58c267794f9b8d - skip including java rather than having recursive includes (and too many files open error) when WM_JAVAC_OPTION isn't defined. --- wmake/rules/General/java | 3 ++- wmake/rules/General/standard | 4 ++-- wmake/rules/linuxmingw32/general | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/wmake/rules/General/java b/wmake/rules/General/java index 4f5db4ce84..e2dd6ced7d 100644 --- a/wmake/rules/General/java +++ b/wmake/rules/General/java @@ -2,7 +2,8 @@ javac = javac -include $(GENERAL_RULES)/java$(WM_JAVAC_OPTION) +## avoid recursive include if WM_JAVAC_OPTION isn't defined +## include $(GENERAL_RULES)/java$(WM_JAVAC_OPTION) javaFLAGS = -classpath $(CLASS_PATH):$(CLASSES_DIR):. $(EXE_INC) $(javaOPT) $(javaDBUG) -d $(CLASSES_DIR) -deprecation diff --git a/wmake/rules/General/standard b/wmake/rules/General/standard index 7752bef084..679070ca25 100644 --- a/wmake/rules/General/standard +++ b/wmake/rules/General/standard @@ -5,7 +5,7 @@ include $(GENERAL_RULES)/sourceToDep include $(GENERAL_RULES)/java include $(GENERAL_RULES)/flex include $(GENERAL_RULES)/flex++ -#include $(GENERAL_RULES)/byacc -#include $(GENERAL_RULES)/btyacc++ +## include $(GENERAL_RULES)/byacc +## include $(GENERAL_RULES)/btyacc++ include $(GENERAL_RULES)/bison include $(GENERAL_RULES)/moc diff --git a/wmake/rules/linuxmingw32/general b/wmake/rules/linuxmingw32/general index 27ccb3c9db..27938b3de0 100644 --- a/wmake/rules/linuxmingw32/general +++ b/wmake/rules/linuxmingw32/general @@ -20,6 +20,6 @@ include $(RULES)/c++ SO = dll EXE_EXT = .exe -# Ensure we know what OS we are compiling for +# Ensure we know what OS we are compiling for # during MakefileFiles and MakefileOptions GFLAGS += -DWIN32 -DLITTLE_ENDIAN