Browse Source

FindTextA is defined on Windows build by windows.h :(

Josh Engebretson 10 years ago
parent
commit
52839876eb

+ 1 - 1
Source/AtomicEditorWork/CMakeLists.txt

@@ -45,7 +45,7 @@ endif(APPLE)
 
 add_executable(AtomicEditorWork ${EXE_TYPE} ${SOURCE_FILES} ${ATOMIC_EDITOR_ICON})
 
-target_link_libraries(AtomicEditorWork ToolCore AtomicJS ToolCoreJS Poco nativefiledialog ${ATOMIC_LINK_LIBRARIES})
+target_link_libraries(AtomicEditorWork Poco nativefiledialog ToolCore AtomicJS ToolCoreJS ${ATOMIC_LINK_LIBRARIES})
 
 if (APPLE)
     set (TARGET_PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.template)

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

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