Commit 545cfc6f5899addf388d6b1949e7e85112c56556
1 parent
8175ee4e
Exists in
master
and in
5 other branches
Ajustando construcao do modulo rexx em windows
Showing
2 changed files
with
5 additions
and
5 deletions
Show diff stats
src/include/plugin.mak.in
@@ -61,9 +61,9 @@ DLL_NAME=@DLLDIR@/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@ | @@ -61,9 +61,9 @@ DLL_NAME=@DLLDIR@/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@ | ||
61 | PLUGIN_NAME=plugins/$(MODULE_NAME)@DLLEXT@ | 61 | PLUGIN_NAME=plugins/$(MODULE_NAME)@DLLEXT@ |
62 | 62 | ||
63 | ifeq ($(LIB3270_MODE),Debug) | 63 | ifeq ($(LIB3270_MODE),Debug) |
64 | - PW3270_LIBS="-L../../../.bin/Debug@DLLDIR@ -lpw3270" | ||
65 | - PW3270_CFLAGS="-I../../../src/include" | ||
66 | - LIB3270_LIBS="-L../../../.bin/Debug@DLLDIR@ -l3270" | 64 | + PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -lpw3270 |
65 | + PW3270_CFLAGS=-I../../../src/include | ||
66 | + LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270 | ||
67 | LIB270_CFLAGS=-I../../../src/include | 67 | LIB270_CFLAGS=-I../../../src/include |
68 | endif | 68 | endif |
69 | 69 |
src/plugins/rx3270/Makefile.in
@@ -48,7 +48,7 @@ include ../../include/plugin.mak | @@ -48,7 +48,7 @@ include ../../include/plugin.mak | ||
48 | $(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME) | 48 | $(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME) |
49 | @echo " CCLD `basename $@`" | 49 | @echo " CCLD `basename $@`" |
50 | @$(MKDIR) `dirname $@` | 50 | @$(MKDIR) `dirname $@` |
51 | - @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(PW3270_LIBS) $(GTK_LIBS) | 51 | + @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) |
52 | 52 | ||
53 | $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@) | 53 | $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@) |
54 | @echo " CCLD `basename $@`" | 54 | @echo " CCLD `basename $@`" |
@@ -60,7 +60,7 @@ $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJ | @@ -60,7 +60,7 @@ $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJ | ||
60 | $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME) | 60 | $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME) |
61 | @echo " CCLD `basename $@`" | 61 | @echo " CCLD `basename $@`" |
62 | @$(MKDIR) `dirname $@` | 62 | @$(MKDIR) `dirname $@` |
63 | - $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(PW3270_LIBS) $(GTK_LIBS) | 63 | + $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) |
64 | 64 | ||
65 | $(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) | 65 | $(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) |
66 | @echo " CCLD `basename $@`" | 66 | @echo " CCLD `basename $@`" |