Fixed merge problems: location of executables and libraries
This commit is contained in:
parent
3393e7183b
commit
56663df4e6
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||||
|
|
||||||
|
|
Reference in a new issue