[CMAKE/AVIFIL32]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 28 Mar 2011 14:17:26 +0000 (14:17 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 28 Mar 2011 14:17:26 +0000 (14:17 +0000)
Move utf-8 resources back into rsrc.rc, move avifile_Bg.rc to the bottom. Fixes compilation with MSVC

svn path=/branches/cmake-bringup/; revision=51183

dll/win32/avifil32/CMakeLists.txt
dll/win32/avifil32/rsrc-utf8.rc [deleted file]
dll/win32/avifil32/rsrc.rc

index 2260517..c11db8b 100644 (file)
@@ -23,7 +23,6 @@ add_library(avifil32 SHARED
     tmpfile.c
     wavfile.c
     rsrc.rc
-    rsrc-utf8.rc
     ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def)
 
 set_module_type(avifil32 win32dll)
diff --git a/dll/win32/avifil32/rsrc-utf8.rc b/dll/win32/avifil32/rsrc-utf8.rc
deleted file mode 100644 (file)
index 1a68e2c..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Top level resource file for avifil32.dll
- *
- * Copyright 2002 Michael G├╝nnewig
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "avifile_private.h"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-#define WINE_OLESELFREGISTER
-#define WINE_FILEDESCRIPTION_STR "Wine AVI file support library"
-#define WINE_FILENAME_STR "avifil32.dll"
-#define WINE_FILEVERSION 4,0,3,1998
-#define WINE_FILEVERSION_STR "4.03.1998"
-
-#include "wine/wine_common_ver.rc"
-
-/*
- * Everything specific to any language goes
- * in one of the specific files.
- */
-
-/* UTF-8 */
-#include "avifile_Bg.rc"
-#include "avifile_Da.rc"
-#include "avifile_De.rc"
-#include "avifile_Fr.rc"
-#include "avifile_Ja.rc"
-#include "avifile_Ko.rc"
-#include "avifile_Lt.rc"
-#include "avifile_Pt.rc"
-#include "avifile_Ro.rc"
-#include "avifile_Ru.rc"
-#include "avifile_Si.rc"
-#include "avifile_Zh.rc"
index a0ec2cf..c768c84 100644 (file)
@@ -29,6 +29,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define WINE_FILEVERSION_STR "4.03.1998"
 
 #include "wine/wine_common_ver.rc"
+#include "avifile_private.h"
 
 /*
  * Everything specific to any language goes
@@ -46,3 +47,16 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "avifile_Tr.rc"
 #include "avifile_Uk.rc"
 
+/* UTF-8 */
+#include "avifile_Da.rc"
+#include "avifile_De.rc"
+#include "avifile_Fr.rc"
+#include "avifile_Ja.rc"
+#include "avifile_Ko.rc"
+#include "avifile_Lt.rc"
+#include "avifile_Pt.rc"
+#include "avifile_Ro.rc"
+#include "avifile_Ru.rc"
+#include "avifile_Si.rc"
+#include "avifile_Zh.rc"
+#include "avifile_Bg.rc"