Commit 9a3b95601fae9bfa829f2e92b985c5c71b49e62f
1 parent
880c631a
Exists in
master
and in
1 other branch
Plugin must be build/link with "C" compiler, the C++ one is for cliente
library.
Showing
3 changed files
with
8 additions
and
17 deletions
Show diff stats
.gitignore
Makefile.in
| ... | ... | @@ -39,8 +39,8 @@ TEST_SOURCES= \ |
| 39 | 39 | |
| 40 | 40 | #---[ Tools ]---------------------------------------------------------------------------- |
| 41 | 41 | |
| 42 | -CC=@CXX@ | |
| 43 | -LD=@CXX@ | |
| 42 | +CC=@CC@ | |
| 43 | +LD=@CC@ | |
| 44 | 44 | LN_S=@LN_S@ |
| 45 | 45 | MKDIR=@MKDIR_P@ |
| 46 | 46 | INSTALL=@INSTALL@ |
| ... | ... | @@ -189,12 +189,10 @@ all: \ |
| 189 | 189 | $(POTDIR)/$(MODULE_NAME).pot |
| 190 | 190 | |
| 191 | 191 | Release: \ |
| 192 | - $(BINRLS)/$(MODULE_NAME)@DLLEXT@ \ | |
| 193 | - $(BINRLS)/$(PACKAGE_NAME)d@EXEEXT@ | |
| 192 | + $(BINRLS)/$(MODULE_NAME)@DLLEXT@ | |
| 194 | 193 | |
| 195 | 194 | $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \ |
| 196 | - $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o) \ | |
| 197 | - $(BINRLS)/lib$(MODULE_NAME).a | |
| 195 | + $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o) | |
| 198 | 196 | |
| 199 | 197 | @$(MKDIR) $(@D) |
| 200 | 198 | @echo $< ... |
| ... | ... | @@ -203,22 +201,12 @@ $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \ |
| 203 | 201 | -o $@ \ |
| 204 | 202 | $(LDFLAGS) \ |
| 205 | 203 | $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o) \ |
| 206 | - -L$(BINRLS) -l$(MODULE_NAME) \ | |
| 207 | 204 | $(V3270_LIBS) \ |
| 208 | 205 | $(LIBS) \ |
| 209 | 206 | $(GTK_LIBS) \ |
| 210 | 207 | $(DBUS_LIBS) |
| 211 | 208 | |
| 212 | 209 | |
| 213 | -$(BINRLS)/lib$(MODULE_NAME).a: \ | |
| 214 | - $(foreach SRC, $(basename $(CORE_SOURCES)), $(OBJRLS)/$(SRC).o) | |
| 215 | - | |
| 216 | - @$(MKDIR) $(@D) | |
| 217 | - @echo $< ... | |
| 218 | - | |
| 219 | - @$(AR) rcs $@ $^ | |
| 220 | - | |
| 221 | - | |
| 222 | 210 | #---[ Install Targets ]------------------------------------------------------------------ |
| 223 | 211 | |
| 224 | 212 | install: \ |
| ... | ... | @@ -292,7 +280,7 @@ $(BINDBG)/$(MODULE_NAME)@DLLEXT@: \ |
| 292 | 280 | -o $@ \ |
| 293 | 281 | $(LDFLAGS) \ |
| 294 | 282 | $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJDBG)/$(SRC).o) \ |
| 295 | - -L$(BINDBG) -lpw3270cpp \ | |
| 283 | + -L$(BINDBG) \ | |
| 296 | 284 | $(V3270_LIBS) \ |
| 297 | 285 | $(LIBS) \ |
| 298 | 286 | $(GTK_LIBS) \ | ... | ... |
hllapi.cbp
| ... | ... | @@ -47,6 +47,8 @@ |
| 47 | 47 | <Unit filename="src/plugin/windows/main.c"> |
| 48 | 48 | <Option compilerVar="CC" /> |
| 49 | 49 | </Unit> |
| 50 | + <Unit filename="src/plugin/windows/private.h" /> | |
| 51 | + <Unit filename="src/plugin/windows/resources.rc" /> | |
| 50 | 52 | <Unit filename="src/testprogram/testprogram.c"> |
| 51 | 53 | <Option compilerVar="CC" /> |
| 52 | 54 | </Unit> | ... | ... |