[myserver-commit] [2777] Fixed windows compiling problems

[Giuseppe Scrivano]

Revision: 2777
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2777
Author:   gscrivano
Date:     2008-09-01 09:28:50 +0000 (Mon, 01 Sep 2008)

Log Message:
-----------
Fixed windows compiling problems

Modified Paths:
--------------
    trunk/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp
    trunk/myserver/binaries/web/cgi-src/math_sum/math_sum.dev
    trunk/myserver/binaries/web/cgi-src/post/post.cpp
    trunk/myserver/binaries/web/cgi-src/post/post.dev
    trunk/myserver/control/MyServer Configure.dev
    trunk/myserver/generate_myserver_dev.pl
    trunk/myserver/myserver.dev
    trunk/myserver/src/Makefile.am
    trunk/myserver/src/base/home_dir/home_dir.cpp

Modified: trunk/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp
===================================================================
--- trunk/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp   2008-09-01 
08:08:51 UTC (rev 2776)
+++ trunk/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp   2008-09-01 
09:28:50 UTC (rev 2777)
@@ -1,8 +1,4 @@
-#ifdef WIN32
-#include "cgi_manager.h"
-#else
 #include <include/http_handler/mscgi/mscgi_manager.h>
-#endif
 
 int isNumber(char* s)
 {

Modified: trunk/myserver/binaries/web/cgi-src/math_sum/math_sum.dev
===================================================================
--- trunk/myserver/binaries/web/cgi-src/math_sum/math_sum.dev   2008-09-01 
08:08:51 UTC (rev 2776)
+++ trunk/myserver/binaries/web/cgi-src/math_sum/math_sum.dev   2008-09-01 
09:28:50 UTC (rev 2777)
@@ -13,7 +13,7 @@
 ProfilesCount=1
 ProfileIndex=0
 ObjFiles=
-Includes=..\..\..\..\include
+Includes=..\..\..\..\include;..\..\..\..
 Libs=
 PrivateResource=
 ResourceIncludes=

Modified: trunk/myserver/binaries/web/cgi-src/post/post.cpp
===================================================================
--- trunk/myserver/binaries/web/cgi-src/post/post.cpp   2008-09-01 08:08:51 UTC 
(rev 2776)
+++ trunk/myserver/binaries/web/cgi-src/post/post.cpp   2008-09-01 09:28:50 UTC 
(rev 2777)
@@ -1,10 +1,5 @@
-#ifdef WIN32
-#include "cgi_manager.h"
-#else
 #include <include/http_handler/mscgi/mscgi_manager.h>
-#endif
 
-
 #ifdef WIN32
 extern "C" int EXPORTABLE myserver_main (char *cmd,MsCgiData* data)
 #else

Modified: trunk/myserver/binaries/web/cgi-src/post/post.dev
===================================================================
--- trunk/myserver/binaries/web/cgi-src/post/post.dev   2008-09-01 08:08:51 UTC 
(rev 2776)
+++ trunk/myserver/binaries/web/cgi-src/post/post.dev   2008-09-01 09:28:50 UTC 
(rev 2777)
@@ -13,7 +13,7 @@
 ProfilesCount=1
 ProfileIndex=0
 ObjFiles=
-Includes=..\..\..\..\include
+Includes=..\..\..\..
 Libs=
 PrivateResource=
 ResourceIncludes=

Modified: trunk/myserver/control/MyServer Configure.dev
===================================================================
--- trunk/myserver/control/MyServer Configure.dev       2008-09-01 08:08:51 UTC 
(rev 2776)
+++ trunk/myserver/control/MyServer Configure.dev       2008-09-01 09:28:50 UTC 
(rev 2777)
@@ -5,7 +5,7 @@
 Type=0
 Ver=1
 ObjFiles=
-Includes=
+Includes=..;.
 Libs=
 PrivateResource=MyServer_Configure_private.rc
 ResourceIncludes=

Modified: trunk/myserver/generate_myserver_dev.pl
===================================================================
--- trunk/myserver/generate_myserver_dev.pl     2008-09-01 08:08:51 UTC (rev 
2776)
+++ trunk/myserver/generate_myserver_dev.pl     2008-09-01 09:28:50 UTC (rev 
2777)
@@ -32,7 +32,7 @@
 Type=1
 Ver=1
 ObjFiles=
-Includes=
+Includes=.
 Libs=
 PrivateResource=myserver_private.rc
 ResourceIncludes=
@@ -52,7 +52,7 @@
 IncludeVersionInfo=1
 SupportXPThemes=0
 CompilerSet=0
-CompilerSettings=0000001000000101000000
+CompilerSettings=0000001000000001000000
 UseCustomMakefile=0
 CustomMakefile=
 

Modified: trunk/myserver/myserver.dev
===================================================================
--- trunk/myserver/myserver.dev 2008-09-01 08:08:51 UTC (rev 2776)
+++ trunk/myserver/myserver.dev 2008-09-01 09:28:50 UTC (rev 2777)
@@ -5,14 +5,14 @@
 Type=1
 Ver=1
 ObjFiles=
-Includes=
+Includes=.
 Libs=
 PrivateResource=myserver_private.rc
 ResourceIncludes=
 MakeIncludes=
 Compiler=
 CppCompiler=
-Linker=-lz.dll -llibxml2 -liconv -lintl -lssl -lcrypto -lrx -lgdi32 -lwininet 
-lwsock32 -luserenv -levent -rdynamic_@
+Linker=-lz.dll -llibxml2 -liconv -lintl -lssl -lcrypto -lrx -lgdi32 -lwininet 
-lwsock32 -luserenv -levent address@hidden@@_
 IsCpp=1
 Icon=
 ExeOutput=binaries
@@ -25,7 +25,7 @@
 IncludeVersionInfo=1
 SupportXPThemes=0
 CompilerSet=0
-CompilerSettings=0000001000000101000000
+CompilerSettings=0000001000000001000000
 UseCustomMakefile=0
 CustomMakefile=
 
@@ -46,6 +46,7 @@
 ProductName=MyServer
 ProductVersion=0.9.0
 AutoIncBuildNr=0
+
 [Unit1]
 FileName=stdafx.cpp
 CompileCpp=1

Modified: trunk/myserver/src/Makefile.am
===================================================================
--- trunk/myserver/src/Makefile.am      2008-09-01 08:08:51 UTC (rev 2776)
+++ trunk/myserver/src/Makefile.am      2008-09-01 09:28:50 UTC (rev 2777)
@@ -38,7 +38,8 @@
                                                                                
plugin/filter/libfilter.a\
                                                                                
plugin/http_command/libhttp_command.a\
                                                                                
server/libserver.a
-libmyserver.a:
+
+libmyserver.a: build_subdirs
        rm -f libmyserver.a
        find -iregex .*\\.o | xargs ar cru libmyserver.a
        ranlib libmyserver.a
@@ -56,7 +57,7 @@
                                                                                
$(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) \
                                                                                
$(XML_LIBS)
 
-myserver_DEPENDENCIES = build_subdirs libmyserver.a
+myserver_DEPENDENCIES = libmyserver.a
 
 build_subdirs:
        list='$(SUBDIRS)'; for subdir in $$list; do \

Modified: trunk/myserver/src/base/home_dir/home_dir.cpp
===================================================================
--- trunk/myserver/src/base/home_dir/home_dir.cpp       2008-09-01 08:08:51 UTC 
(rev 2776)
+++ trunk/myserver/src/base/home_dir/home_dir.cpp       2008-09-01 09:28:50 UTC 
(rev 2777)
@@ -23,7 +23,7 @@
 #include <include/base/file/files_utility.h>
 
 #ifdef WIN32
-#include <userenv/env.h>
+#include <userenv.h>
 #endif
 extern "C" {
 #include <string.h>