Download as
Browse Code »

Commit 9a3b95601fae9bfa829f2e92b985c5c71b49e62f

Authored by Perry Werneck
1 parent 880c631a
Exists in master and in 1 other branch develop

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
@@ -11,3 +11,4 @@ stamp-h1 @@ -11,3 +11,4 @@ stamp-h1
11 .bin 11 .bin
12 .obj 12 .obj
13 dbus-glue.h 13 dbus-glue.h
  14 +*.rc
@@ -39,8 +39,8 @@ TEST_SOURCES= \ @@ -39,8 +39,8 @@ TEST_SOURCES= \
39 39
40 #---[ Tools ]---------------------------------------------------------------------------- 40 #---[ Tools ]----------------------------------------------------------------------------
41 41
42 -CC=@CXX@  
43 -LD=@CXX@ 42 +CC=@CC@
  43 +LD=@CC@
44 LN_S=@LN_S@ 44 LN_S=@LN_S@
45 MKDIR=@MKDIR_P@ 45 MKDIR=@MKDIR_P@
46 INSTALL=@INSTALL@ 46 INSTALL=@INSTALL@
@@ -189,12 +189,10 @@ all: \ @@ -189,12 +189,10 @@ all: \
189 $(POTDIR)/$(MODULE_NAME).pot 189 $(POTDIR)/$(MODULE_NAME).pot
190 190
191 Release: \ 191 Release: \
192 - $(BINRLS)/$(MODULE_NAME)@DLLEXT@ \  
193 - $(BINRLS)/$(PACKAGE_NAME)d@EXEEXT@ 192 + $(BINRLS)/$(MODULE_NAME)@DLLEXT@
194 193
195 $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \ 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 @$(MKDIR) $(@D) 197 @$(MKDIR) $(@D)
200 @echo $< ... 198 @echo $< ...
@@ -203,22 +201,12 @@ $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \ @@ -203,22 +201,12 @@ $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \
203 -o $@ \ 201 -o $@ \
204 $(LDFLAGS) \ 202 $(LDFLAGS) \
205 $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o) \ 203 $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o) \
206 - -L$(BINRLS) -l$(MODULE_NAME) \  
207 $(V3270_LIBS) \ 204 $(V3270_LIBS) \
208 $(LIBS) \ 205 $(LIBS) \
209 $(GTK_LIBS) \ 206 $(GTK_LIBS) \
210 $(DBUS_LIBS) 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 #---[ Install Targets ]------------------------------------------------------------------ 210 #---[ Install Targets ]------------------------------------------------------------------
223 211
224 install: \ 212 install: \
@@ -292,7 +280,7 @@ $(BINDBG)/$(MODULE_NAME)@DLLEXT@: \ @@ -292,7 +280,7 @@ $(BINDBG)/$(MODULE_NAME)@DLLEXT@: \
292 -o $@ \ 280 -o $@ \
293 $(LDFLAGS) \ 281 $(LDFLAGS) \
294 $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJDBG)/$(SRC).o) \ 282 $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJDBG)/$(SRC).o) \
295 - -L$(BINDBG) -lpw3270cpp \ 283 + -L$(BINDBG) \
296 $(V3270_LIBS) \ 284 $(V3270_LIBS) \
297 $(LIBS) \ 285 $(LIBS) \
298 $(GTK_LIBS) \ 286 $(GTK_LIBS) \
@@ -47,6 +47,8 @@ @@ -47,6 +47,8 @@
47 <Unit filename="src/plugin/windows/main.c"> 47 <Unit filename="src/plugin/windows/main.c">
48 <Option compilerVar="CC" /> 48 <Option compilerVar="CC" />
49 </Unit> 49 </Unit>
  50 + <Unit filename="src/plugin/windows/private.h" />
  51 + <Unit filename="src/plugin/windows/resources.rc" />
50 <Unit filename="src/testprogram/testprogram.c"> 52 <Unit filename="src/testprogram/testprogram.c">
51 <Option compilerVar="CC" /> 53 <Option compilerVar="CC" />
52 </Unit> 54 </Unit>