Attachment #156353 for bug #199919

Lines 43-48 Link Here

(-)wxlauncher/Makefile (+4 lines)
43	WX3_USE= WX=3.0+	43	WX3_USE= WX=3.0+
44	WX3_USE_OFF= WX=2.8	44	WX3_USE_OFF= WX=2.8
45		45
		46	.if !defined(WITH_DEBUG)
		47	CXXFLAGS= -DNDEBUG
		48	.endif
		49
46	.include <bsd.port.options.mk>	50	.include <bsd.port.options.mk>
47		51
48	# Allow to build with using concrete wxWidgets version	52	# Allow to build with using concrete wxWidgets version




--- code/apis/JoystickManager.cpp.orig	2015-04-11 22:15:55 UTC
+++ code/apis/JoystickManager.cpp
@@ -65,8 +65,10 @@ bool JoyMan::IsInitialized() {
 */
 bool JoyMan::Initialize() {
 	if ( JoyMan::IsInitialized() ) {
+#if USE_JOYSTICK
 		wxLogDebug(_T("JoyMan already initialized with %d joysticks"),
 			joysticks.Count());
+#endif
 		return true;
 	}
 

Return to bug 199919

Line 0 Link Here

(-)wxlauncher/files/patch-code_apis_JoystickManager.cpp (+13 lines)
	1	--- code/apis/JoystickManager.cpp.orig 2015-04-11 22:15:55 UTC
	2	+++ code/apis/JoystickManager.cpp
	3	@@ -65,8 +65,10 @@ bool JoyMan::IsInitialized() {
	4	*/
	5	bool JoyMan::Initialize() {
	6	if ( JoyMan::IsInitialized() ) {
	7	+#if USE_JOYSTICK
	8	wxLogDebug(_T("JoyMan already initialized with %d joysticks"),
	9	joysticks.Count());
	10	+#endif
	11	return true;
	12	}
	13