Merge pull request #4 from runrev/peter-b/emscripten-dllexport

peter-b · peter-b · commit 69d36d332dcd · 2015-08-11T09:52:34.000+01:00
[emscripten] Mark exported functions with MC_DLLEXPORT_DEF.
diff --git a/engine/src/em-dc.cpp b/engine/src/em-dc.cpp
@@ -39,7 +39,7 @@ MCCreateScreenDC()
 	return new MCScreenDC;
 }
 
-MCStack *
+MC_DLLEXPORT_DEF MCStack *
 MCEmscriptenGetCurrentStack()
 {
 	if (MCnoui) return nil;
diff --git a/engine/src/em-event.cpp b/engine/src/em-event.cpp
@@ -45,11 +45,11 @@ MCEmscriptenEventFinalize()
 
 /* ---------------------------------------------------------------- */
 
-extern "C"
-uint32_t MCEmscriptenEventEncodeModifiers(bool p_shift,
-                                          bool p_alt,
-                                          bool p_ctrl,
-                                          bool p_meta)
+extern "C" MC_DLLEXPORT_DEF uint32_t
+MCEmscriptenEventEncodeModifiers(bool p_shift,
+                                 bool p_alt,
+                                 bool p_ctrl,
+                                 bool p_meta)
 {
 	uint32_t t_result = 0;
 
diff --git a/engine/src/em-exported.json b/engine/src/em-exported.json
@@ -1,12 +1,2 @@
 [
-    '_main',
-    '_MCEmscriptenGetCurrentStack',
-    '_MCEmscriptenEventEncodeModifiers',
-
-    '_MCEventQueuePostImeCompose',
-    '_MCEventQueuePostMouseFocus',
-    '_MCEventQueuePostMousePosition',
-    '_MCEventQueuePostMousePress',
-    '_MCEventQueuePostKeyFocus',
-    '_MCEventQueuePostKeyPress'
 ]
diff --git a/engine/src/em-main.cpp b/engine/src/em-main.cpp
@@ -41,7 +41,7 @@ MCEmscriptenBootError(const char *p_message)
 	exit(99);
 }
 
-int
+MC_DLLEXPORT_DEF int
 main(int argc, char *argv[])
 {
 	/* ---------- Core initialisation */
diff --git a/engine/src/eventqueue.cpp b/engine/src/eventqueue.cpp
@@ -924,6 +924,7 @@ static bool MCEventQueuePostMouse(MCEventType p_type, MCStack *p_stack, uint32_t
 	return true;
 }
 
+MC_DLLEXPORT_DEF
 bool MCEventQueuePostMouseFocus(MCStack *p_stack, uint32_t p_time, bool p_inside)
 {
 	MCEvent *t_event;
@@ -937,6 +938,7 @@ bool MCEventQueuePostMouseFocus(MCStack *p_stack, uint32_t p_time, bool p_inside
 	return true;
 }
 
+MC_DLLEXPORT_DEF
 bool MCEventQueuePostMousePress(MCStack *p_stack, uint32_t p_time, uint32_t p_modifiers, MCMousePressState p_state, int32_t p_button)
 {
 	MCEvent *t_event;
@@ -965,6 +967,7 @@ bool MCEventQueuePostMouseWheel(MCStack *p_stack, uint32_t p_time, uint32_t p_mo
 	return true;
 }
 
+MC_DLLEXPORT_DEF
 bool MCEventQueuePostMousePosition(MCStack *p_stack, uint32_t p_time, uint32_t p_modifiers, int32_t p_x, int32_t p_y)
 {
 	// We look through the current event queue, looking for the last mouse
@@ -1002,6 +1005,7 @@ bool MCEventQueuePostMousePosition(MCStack *p_stack, uint32_t p_time, uint32_t p
 	return true;
 }
 
+MC_DLLEXPORT_DEF
 bool MCEventQueuePostKeyFocus(MCStack *p_stack, bool p_owner)
 {
 	MCEvent *t_event;
@@ -1014,6 +1018,7 @@ bool MCEventQueuePostKeyFocus(MCStack *p_stack, bool p_owner)
 	return true;
 }
 
+MC_DLLEXPORT_DEF
 bool MCEventQueuePostKeyPress(MCStack *p_stack, uint32_t p_modifiers, uint32_t p_char_code, uint32_t p_key_code)
 {
 	MCEvent *t_event;
@@ -1028,6 +1033,7 @@ bool MCEventQueuePostKeyPress(MCStack *p_stack, uint32_t p_modifiers, uint32_t p
 	return true;
 }
 
+MC_DLLEXPORT_DEF
 bool MCEventQueuePostImeCompose(MCStack *p_stack, bool p_enabled, uint32_t p_offset, const uint16_t *p_chars, uint32_t p_char_count)
 {
 	uint16_t *t_new_chars;

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ MCCreateScreenDC()`
`39`	`39`	`return new MCScreenDC;`
`40`	`40`	`}`
`41`	`41`
`42`		`-MCStack *`
	`42`	`+MC_DLLEXPORT_DEF MCStack *`
`43`	`43`	`MCEmscriptenGetCurrentStack()`
`44`	`44`	`{`
`45`	`45`	`if (MCnoui) return nil;`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,2 @@`
`1`	`1`	`[`
`2`		`- '_main',`
`3`		`- '_MCEmscriptenGetCurrentStack',`
`4`		`- '_MCEmscriptenEventEncodeModifiers',`
`5`		`-`
`6`		`- '_MCEventQueuePostImeCompose',`
`7`		`- '_MCEventQueuePostMouseFocus',`
`8`		`- '_MCEventQueuePostMousePosition',`
`9`		`- '_MCEventQueuePostMousePress',`
`10`		`- '_MCEventQueuePostKeyFocus',`
`11`		`- '_MCEventQueuePostKeyPress'`
`12`	`2`	`]`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ MCEmscriptenBootError(const char *p_message)`
`41`	`41`	`exit(99);`
`42`	`42`	`}`
`43`	`43`
`44`		`-int`
	`44`	`+MC_DLLEXPORT_DEF int`
`45`	`45`	`main(int argc, char *argv[])`
`46`	`46`	`{`
`47`	`47`	`/* ---------- Core initialisation */`
Original file line number	Diff line number	Diff line change
`@@ -924,6 +924,7 @@ static bool MCEventQueuePostMouse(MCEventType p_type, MCStack *p_stack, uint32_t`
`924`	`924`	`return true;`
`925`	`925`	`}`
`926`	`926`
	`927`	`+MC_DLLEXPORT_DEF`
`927`	`928`	`bool MCEventQueuePostMouseFocus(MCStack *p_stack, uint32_t p_time, bool p_inside)`
`928`	`929`	`{`
`929`	`930`	`MCEvent *t_event;`
`@@ -937,6 +938,7 @@ bool MCEventQueuePostMouseFocus(MCStack *p_stack, uint32_t p_time, bool p_inside`
`937`	`938`	`return true;`
`938`	`939`	`}`
`939`	`940`
	`941`	`+MC_DLLEXPORT_DEF`
`940`	`942`	`bool MCEventQueuePostMousePress(MCStack *p_stack, uint32_t p_time, uint32_t p_modifiers, MCMousePressState p_state, int32_t p_button)`
`941`	`943`	`{`
`942`	`944`	`MCEvent *t_event;`
`@@ -965,6 +967,7 @@ bool MCEventQueuePostMouseWheel(MCStack *p_stack, uint32_t p_time, uint32_t p_mo`
`965`	`967`	`return true;`
`966`	`968`	`}`
`967`	`969`
	`970`	`+MC_DLLEXPORT_DEF`
`968`	`971`	`bool MCEventQueuePostMousePosition(MCStack *p_stack, uint32_t p_time, uint32_t p_modifiers, int32_t p_x, int32_t p_y)`
`969`	`972`	`{`
`970`	`973`	`// We look through the current event queue, looking for the last mouse`
`@@ -1002,6 +1005,7 @@ bool MCEventQueuePostMousePosition(MCStack *p_stack, uint32_t p_time, uint32_t p`
`1002`	`1005`	`return true;`
`1003`	`1006`	`}`
`1004`	`1007`
	`1008`	`+MC_DLLEXPORT_DEF`
`1005`	`1009`	`bool MCEventQueuePostKeyFocus(MCStack *p_stack, bool p_owner)`
`1006`	`1010`	`{`
`1007`	`1011`	`MCEvent *t_event;`
`@@ -1014,6 +1018,7 @@ bool MCEventQueuePostKeyFocus(MCStack *p_stack, bool p_owner)`
`1014`	`1018`	`return true;`
`1015`	`1019`	`}`
`1016`	`1020`
	`1021`	`+MC_DLLEXPORT_DEF`
`1017`	`1022`	`bool MCEventQueuePostKeyPress(MCStack *p_stack, uint32_t p_modifiers, uint32_t p_char_code, uint32_t p_key_code)`
`1018`	`1023`	`{`
`1019`	`1024`	`MCEvent *t_event;`
`@@ -1028,6 +1033,7 @@ bool MCEventQueuePostKeyPress(MCStack *p_stack, uint32_t p_modifiers, uint32_t p`
`1028`	`1033`	`return true;`
`1029`	`1034`	`}`
`1030`	`1035`
	`1036`	`+MC_DLLEXPORT_DEF`
`1031`	`1037`	`bool MCEventQueuePostImeCompose(MCStack p_stack, bool p_enabled, uint32_t p_offset, const uint16_t p_chars, uint32_t p_char_count)`
`1032`	`1038`	`{`
`1033`	`1039`	`uint16_t *t_new_chars;`