Download as
Browse Code »

Commit 28be8394874174a28b548285e159e7013b1b60a7

Authored by Perry Werneck
1 parent 7b6d8dbd
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Pequenos ajustes no módulo HLLAPI

Showing 2 changed files with 46 additions and 8 deletions   Show diff stats
src/include/pw3270/hllapi.h
  Diff comments   View file @28be839
@@ -114,8 +114,31 @@ extern "C" { @@ -114,8 +114,31 @@ extern "C" {
114 #else 114 #else
115 115
116 #define HLLAPI_API_CALL __attribute__((visibility("default"))) extern 116 #define HLLAPI_API_CALL __attribute__((visibility("default"))) extern
117 - #define WORD uint32_t  
118 - #define LPWORD uint32_t * 117 +
  118 + // From wtypesbase.h
  119 + typedef byte BYTE;
  120 + typedef unsigned short WORD;
  121 + typedef unsigned int UINT;
  122 + typedef int INT;
  123 + typedef LONG WINBOOL;
  124 + typedef LONG LONG;
  125 + typedef ULONG DWORD;
  126 + typedef void *HANDLE;
  127 + typedef WORD *LPWORD;
  128 + typedef DWORD *LPDWORD;
  129 + typedef char CHAR;
  130 + typedef CHAR *LPSTR;
  131 + typedef const CHAR *LPCSTR;
  132 + typedef wchar_t WCHAR;
  133 + typedef WCHAR TCHAR;
  134 + typedef WCHAR *LPWSTR;
  135 + typedef TCHAR *LPTSTR;
  136 + typedef const WCHAR *LPCWSTR;
  137 + typedef const TCHAR *LPCTSTR;
  138 + typedef HANDLE *LPHANDLE;
  139 +
  140 + #define LPWORD uint16_t *
  141 +
119 #define LPSTR char * 142 #define LPSTR char *
120 #define HANDLE int 143 #define HANDLE int
121 144
src/plugins/hllapi/Makefile.in
  Diff comments   View file @28be839
@@ -42,12 +42,16 @@ include $(CLASSLIBDIR)/class.mak @@ -42,12 +42,16 @@ include $(CLASSLIBDIR)/class.mak
42 42
43 #---[ Release Targets ]-------------------------------------------------------- 43 #---[ Release Targets ]--------------------------------------------------------
44 44
45 -$(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME) 45 +$(BINRLS)/$(PLUGIN_NAME): \
  46 + $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME)
  47 +
46 @echo " CCLD `basename $@`" 48 @echo " CCLD `basename $@`"
47 @$(MKDIR) `dirname $@` 49 @$(MKDIR) `dirname $@`
48 @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS) 50 @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS)
49 51
50 -$(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS) 52 +$(BINRLS)$(DLL_NAME).$(VERSION): \
  53 + $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS)
  54 +
51 @echo " CCLD `basename $@`" 55 @echo " CCLD `basename $@`"
52 @$(MKDIR) `dirname $@` 56 @$(MKDIR) `dirname $@`
53 @$(CXX) $(SYSDLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(CLASS_LIBS) 57 @$(CXX) $(SYSDLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(CLASS_LIBS)
@@ -56,19 +60,30 @@ install: @@ -56,19 +60,30 @@ install:
56 60
57 #---[ Debug Targets ]---------------------------------------------------------- 61 #---[ Debug Targets ]----------------------------------------------------------
58 62
59 -$(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME) 63 +$(BINDBG)/$(PLUGIN_NAME): \
  64 + $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME)
  65 +
60 @echo " CCLD `basename $@`" 66 @echo " CCLD `basename $@`"
61 @$(MKDIR) `dirname $@` 67 @$(MKDIR) `dirname $@`
62 @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ @DBGRPATH@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS) 68 @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ @DBGRPATH@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS)
63 69
64 -$(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@) $(CLASS_DEBUG_OBJECTS) 70 +$(BINDBG)$(DLL_NAME).$(VERSION): \
  71 + $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@) $(CLASS_DEBUG_OBJECTS)
  72 +
65 @echo " CCLD `basename $@`" 73 @echo " CCLD `basename $@`"
66 @$(MKDIR) `dirname $@` 74 @$(MKDIR) `dirname $@`
67 @$(CXX) $(SYSDLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @DBGRPATH@ -L../../../.bin/Debug -o $@ $^ $(CLASS_LIBS) 75 @$(CXX) $(SYSDLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @DBGRPATH@ -L../../../.bin/Debug -o $@ $^ $(CLASS_LIBS)
68 76
69 -test: $(BINDBG)/test@EXEEXT@ 77 +test: \
  78 + $(BINDBG)/test@EXEEXT@
  79 +
  80 +cleanDebug: \
  81 + clean
  82 +
  83 +$(BINDBG)/test@EXEEXT@: \
  84 + $(BINDBG)$(DLL_NAME).$(VERSION) $(OBJDBG)/testprogram.o
70 85
71 -$(BINDBG)/test@EXEEXT@: $(BINDBG)$(DLL_NAME).$(VERSION) $(OBJDBG)/testprogram.o  
72 @echo " CCLD `basename $@`" 86 @echo " CCLD `basename $@`"
73 @$(MKDIR) `dirname $@` 87 @$(MKDIR) `dirname $@`
74 @$(LD) -o $@ $^ $(LIBS) $(BINDBG)$(DLL_NAME).$(VERSION) 88 @$(LD) -o $@ $^ $(LIBS) $(BINDBG)$(DLL_NAME).$(VERSION)
  89 +