Fixed|Win32: Fixed build and a bunch of warnings

skyjake · Oct 15, 2012 · 5d4d800 · 5d4d800
1 parent f7f8599
commit 5d4d800
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 19 deletions.
diff --git a/doomsday/engine/portable/src/dd_plugin.c b/doomsday/engine/portable/src/dd_plugin.c
@@ -119,13 +119,12 @@ static int loadPlugin(const char* fileName, const char* pluginPath, void* param)
 
 static boolean unloadPlugin(PluginHandle* handle)
 {
-    int result;
     assert(handle);
-    if(!*handle) return true;
+    if(!*handle) return false;
 
     Library_Delete(*handle);
     *handle = 0;
-    return result;
+    return true;
 }
 
 void Plug_LoadAll(void)

diff --git a/doomsday/engine/portable/src/library.cpp b/doomsday/engine/portable/src/library.cpp
@@ -30,14 +30,14 @@
 #  include <stdbool.h>
 #endif
 
-#include "de_base.h"
-#include "de_filesys.h"
-#include "m_misc.h"
-
 #include <de/App>
 #include <de/NativeFile>
 #include <de/LibraryFile>
 
+#include "de_base.h"
+#include "de_filesys.h"
+#include "m_misc.h"
+
 #ifdef WIN32
 #  include "de_platform.h"
 #endif

diff --git a/doomsday/plugins/dehread/api/dpdehread.def b/doomsday/plugins/dehread/api/dpdehread.def
@@ -1,4 +1,4 @@
-LIBRARY			DPDEHREAD
+LIBRARY			DEHREAD
 
 EXPORTS
-    DP_Initialize   @1
+    DP_Initialize   @1
diff --git a/doomsday/plugins/directsound/api/dsdirectsound.def b/doomsday/plugins/directsound/api/dsdirectsound.def
@@ -1,4 +1,4 @@
-LIBRARY			DSDIRECTSOUND
+LIBRARY			AUDIO_DIRECTSOUND
 
 ; All exports should be prefixed DS_.
 

diff --git a/doomsday/plugins/fmod/api/dsfmod.def b/doomsday/plugins/fmod/api/dsfmod.def
@@ -1,4 +1,4 @@
-LIBRARY			DSFMOD
+LIBRARY			AUDIO_FMOD
 
 ; All exports should be prefixed DS_.
 

diff --git a/doomsday/plugins/jdoom/api/jdoom.def b/doomsday/plugins/jdoom/api/jdoom.def
@@ -1,4 +1,4 @@
-LIBRARY			JDOOM
+LIBRARY			DOOM
 
 EXPORTS
     DP_Initialize   @1

diff --git a/doomsday/plugins/jheretic/api/jheretic.def b/doomsday/plugins/jheretic/api/jheretic.def
@@ -1,4 +1,4 @@
-LIBRARY			JHERETIC
+LIBRARY			HERETIC
 
 EXPORTS
     DP_Initialize   @1

diff --git a/doomsday/plugins/jhexen/api/jhexen.def b/doomsday/plugins/jhexen/api/jhexen.def
@@ -1,4 +1,4 @@
-LIBRARY			JHEXEN
+LIBRARY			HEXEN
 
 EXPORTS
     DP_Initialize   @1

diff --git a/doomsday/plugins/openal/api/dsopenal.def b/doomsday/plugins/openal/api/dsopenal.def
@@ -1,4 +1,4 @@
-LIBRARY			DSOPENAL
+LIBRARY			AUDIO_OPENAL
 
 ; All exports should be prefixed DS_.
 

diff --git a/doomsday/plugins/wadmapconverter/api/dpwadmapconverter.def b/doomsday/plugins/wadmapconverter/api/dpwadmapconverter.def
@@ -1,4 +1,4 @@
-LIBRARY			DPWADMAPCONVERTER
+LIBRARY			WADMAPCONVERTER
 
 EXPORTS
-    DP_Initialize   @1
+    DP_Initialize   @1
diff --git a/doomsday/plugins/winmm/api/dswinmm.def b/doomsday/plugins/winmm/api/dswinmm.def
@@ -1,4 +1,4 @@
-LIBRARY			DSWINMM
+LIBRARY			AUDIO_WINMM
 
 ; All exports should be prefixed DS_.
 

diff --git a/tools/texc/texc.h b/tools/texc/texc.h
@@ -8,6 +8,12 @@
 void strupr(char* str);
 #endif
 
+#ifdef WIN32
+#  define stricmp  _stricmp
+#  define strnicmp _strnicmp
+#  define strupr   _strupr
+#endif
+
 #define VERSION_STR	"1.0"
 #define MAX_TOKEN	256
 #define NUM_GROUPS	2
@@ -67,4 +73,4 @@ typedef struct patch_s
 // Global variables.
 extern bool fullImport;
 
-#endif
+#endif