[[ ExternalsApiV5 ]] Tweaks to lcidlc and support to only generate obj-c related things if __OBJC__ is defined.

runrevmark · runrevmark · commit f8ecc262eae0 · 2013-06-14T17:39:09.000+01:00
[[ ExternalsApiV5 ]] Got revtestexternal compiling on Linux.
diff --git a/lcidlc/Makefile b/lcidlc/Makefile
@@ -9,10 +9,10 @@ SOURCES=\
 CUSTOM_LIBS=core
 CUSTOM_STATIC_LIBS=stdc++
 
-EncodedSupport.c: src/Support.mm
+EncodedSupport.c: Support.mm
 	../prebuilt/bin/Revolution.lnx "./encode_source.rev" "$SRCROOT/src/Support.mm" "$SRCROOT/src/EncodedSupport.c" "g_support_template"
 
-EncodedJavaSupport.c: src/Support.mm
+EncodedJavaSupport.c: Support.mm
 	../prebuilt/bin/Revolution.lnx "./encode_source.rev" "$SRCROOT/src/Support.java" "$SRCROOT/src/EncodedJavaSupport.c" "g_java_support_template"
 
 include $(dir $(lastword $(MAKEFILE_LIST)))/../rules/application.linux.makefile
diff --git a/lcidlc/src/InterfaceGenerate.cpp b/lcidlc/src/InterfaceGenerate.cpp
@@ -620,8 +620,10 @@ static bool InterfaceGenerateHandlers(InterfaceRef self, CoderRef p_coder)
 			CoderWriteLine(p_coder, "{");
 			if (self -> use_objc_objects)
 			{
+				CoderWriteLine(p_coder, "#ifdef __OBJC__");
 				CoderWriteLine(p_coder, "\tNSAutoreleasePool *t_pool;");
 				CoderWriteLine(p_coder, "\tt_pool = [[NSAutoreleasePool alloc] init];");
+				CoderWriteLine(p_coder, "#endif");
 				CoderWriteLine(p_coder, "");
 			}
 			
@@ -771,7 +773,11 @@ static bool InterfaceGenerateHandlers(InterfaceRef self, CoderRef p_coder)
 			}
 			
 			if (self -> use_objc_exceptions)
+			{
+				CoderWriteLine(p_coder, "#ifdef __OBJC__");
 				CoderWriteLine(p_coder, "\tNS_DURING");
+				CoderWriteLine(p_coder, "#endif");
+			}
 				
 			if (t_native_return_type != kNativeTypeNone)
 			{
@@ -798,9 +804,11 @@ static bool InterfaceGenerateHandlers(InterfaceRef self, CoderRef p_coder)
 			
 			if (self -> use_objc_exceptions)
 			{
+				CoderWriteLine(p_coder, "#ifdef __OBJC__");
 				CoderWriteLine(p_coder, "\t\tNS_HANDLER");
 				CoderWriteLine(p_coder, "\t\t\tsuccess = error__raise([[localException reason] cStringUsingEncoding: NSMacOSRomanStringEncoding]);");
 				CoderWriteLine(p_coder, "\t\tNS_ENDHANDLER");
+				CoderWriteLine(p_coder, "#endif");
 			}
 			
 			if (self -> use_cpp_exceptions)
@@ -908,7 +916,9 @@ static bool InterfaceGenerateHandlers(InterfaceRef self, CoderRef p_coder)
 				
 			if (self -> use_objc_objects)
 			{
+				CoderWriteLine(p_coder, "#ifdef __OBJC__");
 				CoderWriteLine(p_coder, "\t[t_pool release];");
+				CoderWriteLine(p_coder, "#endif");
 				CoderWriteLine(p_coder, "");
 			}
 			
diff --git a/lcidlc/src/Support.mm b/lcidlc/src/Support.mm
@@ -17,6 +17,9 @@
 #include <pthread.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
 
 #ifdef __OBJC__
 #import <Foundation/Foundation.h>
diff --git a/revtestexternal/Makefile b/revtestexternal/Makefile
@@ -0,0 +1,25 @@
+NAME=revtestexternal
+TYPE=library
+
+SOURCES=\
+	revtestexternal.cpp \
+	revtestexternalidl.cpp
+
+CUSTOM_DEFINES=
+
+CUSTOM_INCLUDES=./src
+
+CUSTOM_LIBS=
+
+CUSTOM_STATIC_LIBS=stdc++
+
+CUSTOM_DYNAMIC_LIBS=pthread
+
+CUSTOM_CCFLAGS=
+
+CUSTOM_LDFLAGS=
+
+revtestexternalidl.cpp: revtestexternal.lcidl
+	../_build/linux/$(MODE)/lcidlc revtestexternal.lcidl src/revtestexternalidl.cpp
+
+include ../rules/library.linux.makefile
diff --git a/revtestexternal/src/revtestexternal.cpp b/revtestexternal/src/revtestexternal.cpp
@@ -36,7 +36,7 @@ void *thread_begin(void *(*p_callback)(void *), void *p_context)
 	pthread_t t_handle;
 	if (pthread_create(&t_handle, NULL, p_callback, p_context) != 0)
 		return NULL;
-	return t_handle;
+	return (void *)t_handle;
 }
 
 void *thread_finish(void *p_thread)
diff --git a/rules/common.linux.makefile b/rules/common.linux.makefile
@@ -6,6 +6,7 @@ DEFINES=$(CUSTOM_DEFINES) $(TYPE_DEFINES) _LINUX TARGET_PLATFORM_POSIX
 
 GLOBAL_INCLUDES=\
 	$(SOLUTION_DIR)/engine/include \
+	$(SOLUTION_DIR)/lcidlc/include \
 	$(SOLUTION_DIR)/libcore/include \
 	$(SOLUTION_DIR)/libexternal/include \
 	$(SOLUTION_DIR)/thirdparty/headers/linux/include \

Original file line number	Diff line number	Diff line change
`@@ -620,8 +620,10 @@ static bool InterfaceGenerateHandlers(InterfaceRef self, CoderRef p_coder)`
`620`	`620`	`CoderWriteLine(p_coder, "{");`
`621`	`621`	`if (self -> use_objc_objects)`
`622`	`622`	`{`
	`623`	`+ CoderWriteLine(p_coder, "#ifdef __OBJC__");`
`623`	`624`	`CoderWriteLine(p_coder, "\tNSAutoreleasePool *t_pool;");`
`624`	`625`	`CoderWriteLine(p_coder, "\tt_pool = [[NSAutoreleasePool alloc] init];");`
	`626`	`+ CoderWriteLine(p_coder, "#endif");`
`625`	`627`	`CoderWriteLine(p_coder, "");`
`626`	`628`	`}`
`627`	`629`
`@@ -771,7 +773,11 @@ static bool InterfaceGenerateHandlers(InterfaceRef self, CoderRef p_coder)`
`771`	`773`	`}`
`772`	`774`
`773`	`775`	`if (self -> use_objc_exceptions)`
	`776`	`+ {`
	`777`	`+ CoderWriteLine(p_coder, "#ifdef __OBJC__");`
`774`	`778`	`CoderWriteLine(p_coder, "\tNS_DURING");`
	`779`	`+ CoderWriteLine(p_coder, "#endif");`
	`780`	`+ }`
`775`	`781`
`776`	`782`	`if (t_native_return_type != kNativeTypeNone)`
`777`	`783`	`{`
`@@ -798,9 +804,11 @@ static bool InterfaceGenerateHandlers(InterfaceRef self, CoderRef p_coder)`
`798`	`804`
`799`	`805`	`if (self -> use_objc_exceptions)`
`800`	`806`	`{`
	`807`	`+ CoderWriteLine(p_coder, "#ifdef __OBJC__");`
`801`	`808`	`CoderWriteLine(p_coder, "\t\tNS_HANDLER");`
`802`	`809`	`CoderWriteLine(p_coder, "\t\t\tsuccess = error__raise([[localException reason] cStringUsingEncoding: NSMacOSRomanStringEncoding]);");`
`803`	`810`	`CoderWriteLine(p_coder, "\t\tNS_ENDHANDLER");`
	`811`	`+ CoderWriteLine(p_coder, "#endif");`
`804`	`812`	`}`
`805`	`813`
`806`	`814`	`if (self -> use_cpp_exceptions)`
`@@ -908,7 +916,9 @@ static bool InterfaceGenerateHandlers(InterfaceRef self, CoderRef p_coder)`
`908`	`916`
`909`	`917`	`if (self -> use_objc_objects)`
`910`	`918`	`{`
	`919`	`+ CoderWriteLine(p_coder, "#ifdef __OBJC__");`
`911`	`920`	`CoderWriteLine(p_coder, "\t[t_pool release];");`
	`921`	`+ CoderWriteLine(p_coder, "#endif");`
`912`	`922`	`CoderWriteLine(p_coder, "");`
`913`	`923`	`}`
`914`	`924`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ void thread_begin(void (p_callback)(void ), void *p_context)`
`36`	`36`	`pthread_t t_handle;`
`37`	`37`	`if (pthread_create(&t_handle, NULL, p_callback, p_context) != 0)`
`38`	`38`	`return NULL;`
`39`		`- return t_handle;`
	`39`	`+ return (void *)t_handle;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`void thread_finish(void p_thread)`