diff --git a/src/lib/globals.h b/src/lib/globals.h
index c01e567..ea58076 100644
--- a/src/lib/globals.h
+++ b/src/lib/globals.h
@@ -349,5 +349,6 @@ enum state_change
 
 /* Library internal calls */
 void key_ACharacter(unsigned char c, enum keytype keytype, enum iaction cause,Boolean *skipped);
+void lib3270_initialize(void);
 
 
diff --git a/src/lib/lib3270.cbp b/src/lib/lib3270.cbp
index 053300f..0ce2b46 100644
--- a/src/lib/lib3270.cbp
+++ b/src/lib/lib3270.cbp
@@ -7,8 +7,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output=".bin\Debug\lib3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj\Debug\" />
+				<Option output=".bin/Debug/lib3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -17,8 +17,8 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output=".bin\Release\lib3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj\Release\" />
+				<Option output=".bin/Release/lib3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj/Release/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -33,8 +33,9 @@
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
-			<Add directory="..\include" />
-			<Add directory="..\include\lib3270" />
+			<Add option="-DLIB3270=1" />
+			<Add directory="../include" />
+			<Add directory="../include/lib3270" />
 		</Compiler>
 		<Unit filename="Makefile.in" />
 		<Unit filename="XtGlue.c">
@@ -163,9 +164,8 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="telnetc.h" />
-		<Unit filename="tesprogram.c">
+		<Unit filename="testprogram.c">
 			<Option compilerVar="CC" />
-			<Option target="Debug" />
 		</Unit>
 		<Unit filename="tn3270e.h" />
 		<Unit filename="toggles.c">
diff --git a/src/lib/tesprogram.c b/src/lib/tesprogram.c
deleted file mode 100644
index 72f2a19..0000000
--- a/src/lib/tesprogram.c
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#include <stdio.h>
-#include <lib3270.h>
-
-int main(int numpar, char *param[])
-{
-	H3270 *h;
-
-	lib3270_initialize();
-
-	h = lib3270_session_new("");
-	printf("3270 session %p created\n",h);
-
-
-
-
-	printf("Ending 3270 session %p\n",h);
-	lib3270_session_free(h);
-
-	return 0;
-}
diff --git a/src/lib/testprogram.c b/src/lib/testprogram.c
new file mode 100644
index 0000000..6ab426e
--- /dev/null
+++ b/src/lib/testprogram.c
@@ -0,0 +1,73 @@
+
+#include <stdio.h>
+#include <string.h>
+#include "globals.h"
+#include <lib3270/macros.h>
+
+#define MAX_ARGS 10
+
+int main(int numpar, char *param[])
+{
+	H3270	* h;
+	char 	  line[4096];
+
+	lib3270_initialize();
+
+	h = lib3270_session_new("");
+	printf("3270 session %p created\n]",h);
+
+	while(fgets(line,4095,stdin))
+	{
+		const LIB3270_MACRO_LIST *cmd = get_3270_calls();
+
+		int		 	  f;
+		int			  argc = 0;
+		const char	* argv[MAX_ARGS];
+		char		* ptr;
+
+		line[4095] = 0;	// Just in case.
+
+		for(ptr = line;ptr && *ptr != '\n';ptr++);
+		*ptr = 0;
+
+		if(!*line)
+			break;
+
+		argv[argc++] = strtok(line," ");
+		for(f=1;f<MAX_ARGS;f++)
+		{
+			if( (argv[argc++] = strtok(NULL," ")) == NULL)
+				break;
+		}
+		argc--;
+
+		if(!strcmp(argv[0],"quit"))
+			break;
+
+		for(f=0;cmd[f].name;f++)
+		{
+			if(!strcmp(cmd[f].name,argv[0]))
+			{
+				char *str = cmd[f].exec(h,argc,argv);
+				if(str)
+				{
+					printf("\n%s\n",str);
+					free(str);
+				}
+				else
+				{
+					printf("\nNo response\n");
+				}
+				break;
+			}
+		}
+
+		printf("\n]");
+
+	}
+
+	printf("Ending 3270 session %p\n",h);
+	lib3270_session_free(h);
+
+	return 0;
+}
--
libgit2 0.21.2