Browse Source

Another attempt at fixing Windows preprocessor defines

Josh Engebretson 10 years ago
parent
commit
20d62cb792

+ 0 - 7
Source/AtomicEditorWork/Editors/JSResourceEditor.cpp

@@ -12,15 +12,8 @@
 #include <Atomic/Core/CoreEvents.h>
 #include <Atomic/Core/CoreEvents.h>
 #include <AtomicJS/Javascript/JSVM.h>
 #include <AtomicJS/Javascript/JSVM.h>
 
 
-/*
-#include "../AEEvents.h"
-#include "../UI/UIFindTextWidget.h"
-#include "../AEJavascript.h"
-*/
-
 #include "JSResourceEditor.h"
 #include "JSResourceEditor.h"
 
 
-
 #include "../Javascript/JSAutocomplete.h"
 #include "../Javascript/JSAutocomplete.h"
 #include "../Javascript/JSTheme.h"
 #include "../Javascript/JSTheme.h"
 #include "../Javascript/JSASTSyntaxColorVisitor.h"
 #include "../Javascript/JSASTSyntaxColorVisitor.h"

+ 0 - 6
Source/AtomicEditorWork/Editors/JSResourceEditor.h

@@ -12,12 +12,6 @@
 using namespace Atomic;
 using namespace Atomic;
 using namespace tb;
 using namespace tb;
 
 
-#ifdef ATOMIC_PLATFORM_WINDOWS
-
-#undef FindText
-
-#endif
-
 namespace AtomicEditor
 namespace AtomicEditor
 {
 {
 
 

+ 4 - 2
Source/ThirdParty/Duktape/duktape.h

@@ -601,8 +601,10 @@ static __inline__ unsigned long long duk_rdtsc(void) {
 #ifdef GetMessage
 #ifdef GetMessage
 #undef GetMessage
 #undef GetMessage
 #endif
 #endif
- 
-// ATOMIC END 
+#ifdef FindText
+#undef FindText
+#endif
+// ATOMIC END
 #elif defined(DUK_F_FLASHPLAYER)
 #elif defined(DUK_F_FLASHPLAYER)
 /* Crossbridge */
 /* Crossbridge */
 #define DUK_USE_DATE_NOW_GETTIMEOFDAY
 #define DUK_USE_DATE_NOW_GETTIMEOFDAY