Fixed merge problems: location of executables and libraries

This commit is contained in:
Hrvoje Jasak 2010-12-27 11:50:58 +00:00
parent 3393e7183b
commit 56663df4e6

View file

@ -58,7 +58,7 @@ WM_SCRIPTS = $(WM_DIR)/scripts
LIB_SRC = $(WM_PROJECT_DIR)/src LIB_SRC = $(WM_PROJECT_DIR)/src
LIB_DIR = $(WM_PROJECT_DIR)/lib LIB_DIR = $(WM_PROJECT_DIR)/lib
LIB_WM_OPTIONS_DIR = $(LIB_DIR) LIB_WM_OPTIONS_DIR = $(LIB_DIR)/$(WM_OPTIONS)
OBJECTS_DIR = $(MAKE_DIR)/$(WM_OPTIONS) OBJECTS_DIR = $(MAKE_DIR)/$(WM_OPTIONS)
CLASSES_DIR = $(MAKE_DIR)/classes CLASSES_DIR = $(MAKE_DIR)/classes