Permalink
Browse files

emake no longer has direct dependency on lodepng or zlib

  • Loading branch information...
RobertBColton committed Feb 12, 2019
1 parent 8f1b707 commit c90025954d62e12450ed269b2875dd44fdfdda01
Showing with 3 additions and 3 deletions.
  1. +2 −2 CommandLine/emake/Makefile
  2. +1 −1 Makefile
@@ -17,8 +17,8 @@ else
endif

PROTO_DIR := $(SHARED_SRC_DIR)/protos
CXXFLAGS := -I$(SRC_DIR) -I../../CompilerSource -I$(SHARED_SRC_DIR) -I$(SHARED_SRC_DIR)/lodepng -I$(PROTO_DIR) -I$(PROTO_DIR)/codegen -std=c++11 -Wall -Wextra -Wpedantic -g
LDFLAGS := $(OS_LIBS) -L../../ -lz -L$(SHARED_SRC_DIR)/lodepng -llodepng -lProtocols -lprotobuf
CXXFLAGS := -I$(SRC_DIR) -I../../CompilerSource -I$(SHARED_SRC_DIR) -I$(PROTO_DIR) -I$(PROTO_DIR)/codegen -std=c++11 -Wall -Wextra -Wpedantic -g
LDFLAGS := $(OS_LIBS) -L../../ -lProtocols -lprotobuf

rwildcard=$(wildcard $1/$2) $(foreach d,$(wildcard $1/*),$(call rwildcard,$d,$2))
SOURCES := $(call rwildcard,$(SRC_DIR),*.cpp)
@@ -31,7 +31,7 @@ libProtocols: .FORCE
libEGM: .FORCE liblodepng libProtocols
$(MAKE) -C CommandLine/libEGM/

EMAKE_TARGETS = .FORCE liblodepng
EMAKE_TARGETS = .FORCE

ifneq ($(CLI_ENABLE_EGM), FALSE)
EMAKE_TARGETS += libEGM

0 comments on commit c900259

Please sign in to comment.