zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix wmake bug introduced by a9699afbb4

Browse Source 
- skip including java rather than having recursive includes
  (and too many files open error) when WM_JAVAC_OPTION isn't defined.
This commit is contained in:
Mark Olesen
2009-07-16 13:32:40 +02:00
parent 7b3eb9da14
commit 33358fd383
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wmake/rules/General/java
View File

@ -2,7 +2,8 @@
javac = javac 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 javaFLAGS = -classpath $(CLASS_PATH):$(CLASSES_DIR):. $(EXE_INC) $(javaOPT) $(javaDBUG) -d $(CLASSES_DIR) -deprecation

4
wmake/rules/General/standard
View File

@ -5,7 +5,7 @@ include $(GENERAL_RULES)/sourceToDep
include $(GENERAL_RULES)/java include $(GENERAL_RULES)/java
include $(GENERAL_RULES)/flex include $(GENERAL_RULES)/flex
include $(GENERAL_RULES)/flex++ include $(GENERAL_RULES)/flex++
#include $(GENERAL_RULES)/byacc ## include $(GENERAL_RULES)/byacc
#include $(GENERAL_RULES)/btyacc++ ## include $(GENERAL_RULES)/btyacc++
include $(GENERAL_RULES)/bison include $(GENERAL_RULES)/bison
include $(GENERAL_RULES)/moc include $(GENERAL_RULES)/moc

2
wmake/rules/linuxmingw32/general
View File

@ -20,6 +20,6 @@ include $(RULES)/c++
SO = dll SO = dll
EXE_EXT = .exe 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 # during MakefileFiles and MakefileOptions
GFLAGS += -DWIN32 -DLITTLE_ENDIAN GFLAGS += -DWIN32 -DLITTLE_ENDIAN