Skip to content
Snippets Groups Projects
Commit 33358fd3 authored by Mark Olesen's avatar Mark Olesen
Browse files

fix wmake bug introduced by a9699afb

- skip including java rather than having recursive includes
  (and too many files open error) when WM_JAVAC_OPTION isn't defined.
parent 7b3eb9da
Branches
Tags
No related merge requests found
......@@ -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
......
......@@ -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
......@@ -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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment