gephex--main--0.4--patch-1817
[email protected] Wed, 17 Nov 2004 15:28:59 +0100 (CET)
Newsgroups
gmane.comp.video.gephex.devel
Message-ID
<[email protected] >
Archive: [email protected]
New revision: gephex--main--0.4--patch-1817
--
Revision: gephex--main--0.4--patch-1817
Archive: [email protected]
Creator: GePhex <[email protected] >
Date: Wed Nov 17 15:28:22 CET 2004
Standard-date: 2004-11-17 14:28:22 GMT
Modified-files: build/make_binary_dist.bat config_h.win32
configure.ac data/gephexw.conf.default
engine/src/dllloader/dllloader.cpp
engine/src/dllloader/dllloader.dep
engine/src/dllloader/dllloader.dsp
engine/src/dllloader/dllloader.mak
engine/src/dllloader/frei0r.h
engine/src/dllloader/frei0rwrapper.cpp
engine/src/dllloader/frei0rwrapper.h
modules/src/ifsmodule/ifsmodule.dep
modules/src/ifsmodule/ifsmodule.dsp
modules/src/ifsmodule/ifsmodule.mak
New-patches: [email protected] /gephex--georg--0.4--patch-359
[email protected] /gephex--georg--0.4--patch-360
[email protected] /gephex--georg--0.4--patch-361
[email protected] /gephex--main--0.4--patch-1817
Summary: update frei0r loader, win32 compilation fixes
Keywords:
Patches applied:
* [email protected] /gephex--georg--0.4--patch-359
Better widgets for frei0r parameters
* [email protected] /gephex--georg--0.4--patch-360
Version bump to 0.4.2
* [email protected] /gephex--georg--0.4--patch-361
win32 compilation fixes
* added files
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-359
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-360
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-361
{arch}/gephex/gephex--main/gephex--main--0.4/[email protected] /patch-log/patch-1817
* file metadata changed
./build/make_binary_dist.bat
--permissions 744
=> --permissions 644
./engine/src/dllloader/dllloader.dep
--permissions 755
=> --permissions 644
./modules/src/ifsmodule/ifsmodule.dep
--permissions 755
=> --permissions 644
* modified files
--- orig/build/make_binary_dist.bat
+++ mod/build/make_binary_dist.bat
@@ -11,6 +11,7 @@
echo "- Copying stuff..."
xcopy /E /V /I ..in %TARGET_DIR%in
xcopy /E /V /I ..\dlls %TARGET_DIR%\dlls
+mkdir %TARGET_DIR%\dlls rei0rs
xcopy /E /V /I ..\examples %TARGET_DIR%\examples
xcopy /E /V /I ..\doc %TARGET_DIR%\doc
@@ -40,6 +41,8 @@
copy %TARGET_DIR%\examples\graphs\example2 %TARGET_DIR%\graphs
copy %TARGET_DIR%\examples\graphs\example3 %TARGET_DIR%\graphs
copy %TARGET_DIR%\examples\graphs\gephexwin32 %TARGET_DIR%\graphs
+copy %TARGET_DIR%\examples\graphs zcam4 %TARGET_DIR%\graphs
+copy %TARGET_DIR%\examples\graphs
oise %TARGET_DIR%\graphs
--- orig/config_h.win32
+++ mod/config_h.win32
@@ -11,11 +11,11 @@
#define OPT_INCLUDE_MMX
#undef OPT_SERIALIZE_FRAMEBUFFER
-#define VERSION "0.4.1"
+#define VERSION "0.4.2"
#define FRBINMODULE_CACHE_SIZE 128
-
-#define WITH_FFMPEG
-#define WITH_SDL
+
+#define WITH_FFMPEG
+#define WITH_SDL
#endif
\ No newline at end of file
--- orig/configure.ac
+++ mod/configure.ac
@@ -2,7 +2,7 @@
AC_PREREQ(2.59) dnl force autoconf version
AC_CONFIG_SRCDIR([base/src/utils/autoptr.h])
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gephex,0.4.1)
+AM_INIT_AUTOMAKE(gephex,0.4.2)
AM_CONFIG_HEADER(config.h)
# Checks for programs.
--- orig/data/gephexw.conf.default
+++ mod/data/gephexw.conf.default
@@ -4,6 +4,7 @@
engine {
module_path = [../dlls/modules/]
+ frei0r_path = [../dlls/frei0rs/]
type_path = [../dlls/types/]
graph_path = [../graphs/]
ipc_unix_node_prefix = [/tmp/gephex_socket_]
--- orig/engine/src/dllloader/dllloader.cpp
+++ mod/engine/src/dllloader/dllloader.cpp
@@ -599,7 +599,7 @@
std::vector<bool> isStrong(numInputs);
std::vector<const TypeAttributes*> fixedAttributes(numInputs);
- std::vector<std::string> f0r_param_names;
+ std::vector<f0r_param_info_t> f0r_param_infos;
for (int i = 0; i < numInputs; ++i)
{
@@ -608,11 +608,10 @@
{
std::string param_name;
inSpec = frei0r_create_in_param_spec(f0r_info, frei0r, i,
- param_name);
+ f0r_param_infos);
#if (ENGINE_VERBOSITY > 1)
std::cout << "param # " << i << ": '" << inSpec << "'
";
#endif
- f0r_param_names.push_back(param_name);
}
else
{
@@ -762,7 +761,7 @@
if (frei0r)
{
std::vector<char> buf = frei0r_create_info(f0r_info,
- f0r_param_names);
+ f0r_param_infos);
#if (ENGINE_VERBOSITY > 1)
std::cout << "Inf0r: '" << &buf[0] << "'
";
--- orig/engine/src/dllloader/dllloader.dep
+++ mod/engine/src/dllloader/dllloader.dep
@@ -28,11 +28,14 @@
"..\..\..ase\src\interfaces\itype.h"\
"..\..\..ase\src\interfaces\itypefactory.h"\
"..\..\..ase\src\utilsutoptr.h"\
+ "..\..\..\util\includeasic_types.h"\
"..
enderer ypefactory.h"\
"._functiontypes.h"\
"._module.h"\
"._moduleclass.h"\
"._moduletables.h"\
+ ". rei0r.h"\
+ ". rei0rwrapper.h"\
._output.cpp : \
@@ -96,18 +99,34 @@
"..\..\..ase\src\utils\sharedlibrary.h"\
"..\..\..ase\src\utils\structreader.h"\
"..\..\..onfig.h"\
+ "..\..\..\util\includeasic_types.h"\
"._functiontypes.h"\
"._moduleclass.h"\
"._moduletables.h"\
"._typeclass.h"\
"._typetables.h"\
".\dllloader.h"\
+ ". rei0r.h"\
+ ". rei0rwrapper.h"\
".\moduleclassspec.h"\
".\moduleinfoutils.h"\
".
ameresolver.h"\
". ypedllloader.h"\
+. rei0rwrapper.cpp : \
+ "..\..\..onfig.h"\
+ "..\..\.. ypes\src ramebuffertype ramebuffertype.h"\
+ "..\..\.. ypes\src
umbertype
umbertype.h"\
+ "..\..\..\util\includeasic_types.h"\
+ "..\engine\dllutils.h"\
+ "._functiontypes.h"\
+ "._moduletables.h"\
+ ". rei0r.h"\
+ ". rei0r.xpm"\
+ ". rei0rwrapper.h"\
+
+
.\moduleclassspec.cpp : \
"..\..\..ase\src\interfaces\imoduleclassspec.h"\
".\moduleclassspec.h"\
--- orig/engine/src/dllloader/dllloader.dsp
+++ mod/engine/src/dllloader/dllloader.dsp
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /G6 /MD /w /W0 /GR /GX /O2 /Ob2 /I ".." /I "../../../base/src" /I "../../../" /D "_LIB" /D "NDEBUG" /D "_MBCS" /D for="if (0) {} else for" /D "HAVE_CONFIG_H" /YX /FD /c
+# ADD CPP /nologo /G6 /MD /w /W0 /GR /GX /O2 /Ob2 /I ".." /I "../../../base/src" /I "../../../" /I "../../../util/include" /D "_LIB" /D "NDEBUG" /D "_MBCS" /D for="if (0) {} else for" /D "HAVE_CONFIG_H" /YX /FD /c
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe
@@ -64,7 +64,7 @@
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MTd /w /W0 /Gm /GR /GX /ZI /Od /I ".." /I "../../../base/src" /I "../../../" /D "_LIB" /D "_DEBUG" /D "_MBCS" /D for="if (0) {} else for" /D "HAVE_CONFIG_H" /D ENGINE_VERBOSITY=0 /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /MTd /w /W0 /Gm /GR /GX /ZI /Od /I ".." /I "../../../base/src" /I "../../../" /I "../../../util/include" /D "_LIB" /D "_DEBUG" /D "_MBCS" /D for="if (0) {} else for" /D "HAVE_CONFIG_H" /D ENGINE_VERBOSITY=0 /YX /FD /GZ /c
# ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe
@@ -117,6 +117,10 @@
# End Source File
# Begin Source File
+SOURCE=. rei0rwrapper.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\moduleclassspec.cpp
# End Source File
# Begin Source File
@@ -181,6 +185,14 @@
# End Source File
# Begin Source File
+SOURCE=. rei0r.h
+# End Source File
+# Begin Source File
+
+SOURCE=. rei0rwrapper.h
+# End Source File
+# Begin Source File
+
SOURCE=.\moduleclassspec.h
# End Source File
# Begin Source File
--- orig/engine/src/dllloader/dllloader.mak
+++ mod/engine/src/dllloader/dllloader.mak
@@ -45,6 +45,7 @@
-@erase "$(INTDIR)_type.obj"
-@erase "$(INTDIR)_typeclass.obj"
-@erase "$(INTDIR)\dllloader.obj"
+ -@erase "$(INTDIR) rei0rwrapper.obj"
-@erase "$(INTDIR)\moduleclassspec.obj"
-@erase "$(INTDIR)\moduleinfoutils.obj"
-@erase "$(INTDIR)
ameresolver.obj"
@@ -59,7 +60,7 @@
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /G6 /MD /w /W0 /GR /GX /O2 /Ob2 /I ".." /I "../../../base/src" /I "../../../" /D "_LIB" /D "NDEBUG" /D "_MBCS" /D for="if (0) {} else for" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\dllloader.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /c
+CPP_PROJ=/nologo /G6 /MD /w /W0 /GR /GX /O2 /Ob2 /I ".." /I "../../../base/src" /I "../../../" /I "../../../util/include" /D "_LIB" /D "NDEBUG" /D "_MBCS" /D for="if (0) {} else for" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\dllloader.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -107,6 +108,7 @@
"$(INTDIR)_type.obj" \
"$(INTDIR)_typeclass.obj" \
"$(INTDIR)\dllloader.obj" \
+ "$(INTDIR) rei0rwrapper.obj" \
"$(INTDIR)\moduleclassspec.obj" \
"$(INTDIR)\moduleinfoutils.obj" \
"$(INTDIR)
ameresolver.obj" \
@@ -137,6 +139,7 @@
-@erase "$(INTDIR)_type.obj"
-@erase "$(INTDIR)_typeclass.obj"
-@erase "$(INTDIR)\dllloader.obj"
+ -@erase "$(INTDIR) rei0rwrapper.obj"
-@erase "$(INTDIR)\moduleclassspec.obj"
-@erase "$(INTDIR)\moduleinfoutils.obj"
-@erase "$(INTDIR)
ameresolver.obj"
@@ -153,7 +156,7 @@
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /G6 /MTd /w /W0 /Gm /GR /GX /ZI /Od /I ".." /I "../../../base/src" /I "../../../" /D "_LIB" /D "_DEBUG" /D "_MBCS" /D for="if (0) {} else for" /D "HAVE_CONFIG_H" /D ENGINE_VERBOSITY=0 /Fp"$(INTDIR)\dllloader.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /GZ /c
+CPP_PROJ=/nologo /G6 /MTd /w /W0 /Gm /GR /GX /ZI /Od /I ".." /I "../../../base/src" /I "../../../" /I "../../../util/include" /D "_LIB" /D "_DEBUG" /D "_MBCS" /D for="if (0) {} else for" /D "HAVE_CONFIG_H" /D ENGINE_VERBOSITY=0 /Fp"$(INTDIR)\dllloader.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -201,6 +204,7 @@
"$(INTDIR)_type.obj" \
"$(INTDIR)_typeclass.obj" \
"$(INTDIR)\dllloader.obj" \
+ "$(INTDIR) rei0rwrapper.obj" \
"$(INTDIR)\moduleclassspec.obj" \
"$(INTDIR)\moduleinfoutils.obj" \
"$(INTDIR)
ameresolver.obj" \
@@ -264,6 +268,11 @@
"$(INTDIR)\dllloader.obj" : $(SOURCE) "$(INTDIR)" "..\..\..onfig.h"
+SOURCE=. rei0rwrapper.cpp
+
+"$(INTDIR) rei0rwrapper.obj" : $(SOURCE) "$(INTDIR)" "..\..\..onfig.h"
+
+
SOURCE=.\moduleclassspec.cpp
"$(INTDIR)\moduleclassspec.obj" : $(SOURCE) "$(INTDIR)"
--- orig/engine/src/dllloader/frei0r.h
+++ mod/engine/src/dllloader/frei0r.h
@@ -23,7 +23,8 @@
#ifndef INCLUDED_FREI0R_H
#define INCLUDED_FREI0R_H
-#include <inttypes.h>
+//#include <inttypes.h>
+#include "basic_types.h"
/**
* The frei0r API major version
--- orig/engine/src/dllloader/frei0rwrapper.cpp
+++ mod/engine/src/dllloader/frei0rwrapper.cpp
@@ -168,23 +168,26 @@
static std::string quote_spaces(const std::string& s)
{
- std::string ret;
+ std::string ret;
+ ret.resize(s.length());
for (int i = 0; i < s.length(); ++i)
{
char c = s[i];
- ret.push_back((c == ' ') ? '_' : c);
+ ret[i] = ((c == ' ') ? '_' : c);
}
return ret;
}
-std::string frei0r_create_in_param_spec(const f0r_plugin_info_t& f0r_info,
- frei0r_funs_t* frei0r, int input,
- std::string& param_name)
+std::string
+frei0r_create_in_param_spec(const f0r_plugin_info_t& f0r_info,
+ frei0r_funs_t* frei0r, int input,
+ std::vector<f0r_param_info_t>& param_infos)
{
//return "input_spec { type=typ_FrameBufferType id=b const=true strong_dependency=true } ";
int index = -1;
+ std::string param_name;
std::ostringstream os;
os << "input_spec { type=";
@@ -231,6 +234,7 @@
f0r_param_info_t pinfo;
frei0r->get_param_info(&pinfo, index);
+ param_infos.push_back(pinfo);
switch (pinfo.type)
{
@@ -258,12 +262,12 @@
}
-std::vector<char> frei0r_create_info(const f0r_plugin_info_t& f0r_info,
- const std::vector<std::string>& param_names)
+std::vector<char>
+frei0r_create_info(const f0r_plugin_info_t& f0r_info,
+ const std::vector<f0r_param_info_t>& param_infos)
{
std::ostringstream os;
int num_inputs = frei0r_num_inputs(f0r_info);
- int param_offset;
// static const char* INFO = "info { name=[Gradientnorm] group=[Filter] inputs=[3 Image Lightness{lower_bound=[0] step_size=[0.01] higher_bound=[1] hidden=[true] help=[lightness] } Algorithm{widget_type=[combo_box] values=[sobel,roberts-cross] hidden=[true] help=[sobel is slower and smoother, roberts-cross is quick and dirty] } ] outputs=[1 Image ] type=xpm } ";
os << "info { name=[" << f0r_info.name
@@ -276,17 +280,25 @@
"lower_bound=8 step_size=8 higher_bound=4096 hidden=true}";
os << " Width" << properties << " Height" << properties;
- param_offset = 2;
}
else if (f0r_info.plugin_type == F0R_PLUGIN_TYPE_FILTER)
{
os << " Image ";
- param_offset = 1;
}
for (int i = 0; i < f0r_info.num_params; ++i)
{
- os << quote_spaces(param_names[i+param_offset]) << " ";
+ std::string properties;
+ switch(param_infos[i].type)
+ {
+ case F0R_PARAM_BOOL:
+ properties = "{widget_type=radio_button}"; break;
+ case F0R_PARAM_DOUBLE:
+ properties = "{widget_type=number_selector}"; break;
+ default:
+ properties = "";
+ }
+ os << quote_spaces(param_infos[i].name) << properties << " ";
}
std::string time_properties = "{widget_type=unboundednumber_selector}";
--- orig/engine/src/dllloader/frei0rwrapper.h
+++ mod/engine/src/dllloader/frei0rwrapper.h
@@ -46,15 +46,17 @@
std::string frei0r_create_spec(const f0r_plugin_info_t&);
-std::string frei0r_create_in_param_spec(const f0r_plugin_info_t& f0r_info,
- frei0r_funs_t* frei0r, int input,
- std::string& param_name);
+std::string
+frei0r_create_in_param_spec(const f0r_plugin_info_t& f0r_info,
+ frei0r_funs_t* frei0r, int input,
+ std::vector<f0r_param_info_t>& param_infos);
std::string frei0r_create_out_spec();
-std::vector<char> frei0r_create_info(const f0r_plugin_info_t& f0r_info,
- const std::vector<std::string>& param_names);
+std::vector<char>
+frei0r_create_info(const f0r_plugin_info_t& f0r_info,
+ const std::vector<f0r_param_info_t>& param_infos);
void frei0r_check_plugin_info(const f0r_plugin_info_t& f0r_info);
--- orig/modules/src/ifsmodule/ifsmodule.dep
+++ mod/modules/src/ifsmodule/ifsmodule.dep
@@ -7,6 +7,7 @@
"..\..\.. ypes\src\ifstype\ifstype.h"\
"..\..\.. ypes\src
umbertype
umbertype.h"\
"..\..\..\util\includeasic_types.h"\
+ "..\..\..\util\src\miscrandgen.h"\
".\ifsmodule.h"\
--- orig/modules/src/ifsmodule/ifsmodule.dsp
+++ mod/modules/src/ifsmodule/ifsmodule.dsp
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ifsmodule_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /Ob2 /I "../../.." /I "../../../util/include/" /I "../../../types/src/ifstype" /I "../../../types/src/framebuffertype" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include/compatibility" /I "../../../util/include" /D "NDEBUG" /D "HAVE_CONFIG_H" /D for="if(0); else for" /D "_WINDOWS" /D "_USRDLL" /D "ifsmodule_EXPORTS" /D for="if (0); else for" /D "_MBCS" /D "WIN32" /YX /FD /c
+# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /Ob2 /I "../../.." /I "../../../util/include/" /I "../../../types/src/ifstype" /I "../../../types/src/framebuffertype" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include/compatibility" /I "../../../util/include" /I "../../../util/src/misc" /D "NDEBUG" /D "HAVE_CONFIG_H" /D for="if(0); else for" /D "_WINDOWS" /D "_USRDLL" /D "ifsmodule_EXPORTS" /D for="if (0); else for" /D "_MBCS" /D "WIN32" /YX /FD /c
# SUBTRACT CPP /X
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -76,7 +76,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ifsmodule_EXPORTS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MDd /W2 /Gm /GX /ZI /Od /I "../../../" /I "../../../types/src/ifstype" /I "../../../types/src/framebuffertype" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include/compatibility" /I "../../../util/include" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "ifsmodule_EXPORTS" /D for="if (0); else for" /D "_MBCS" /D "WIN32" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /MDd /W2 /Gm /GX /ZI /Od /I "../../../" /I "../../../types/src/ifstype" /I "../../../types/src/framebuffertype" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include/compatibility" /I "../../../util/include" /I "../../../util/src/misc" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "ifsmodule_EXPORTS" /D for="if (0); else for" /D "_MBCS" /D "WIN32" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "_DEBUG"
--- orig/modules/src/ifsmodule/ifsmodule.mak
+++ mod/modules/src/ifsmodule/ifsmodule.mak
@@ -25,6 +25,10 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "ifsmodule - Win32 Release"
OUTDIR=.\Release
@@ -47,42 +51,8 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /G6 /MD /W3 /GX /O2 /Ob2 /I "../../.." /I "../../../util/include/" /I "../../../types/src/ifstype" /I "../../../types/src/framebuffertype" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include/compatibility" /I "../../../util/include" /D "NDEBUG" /D "HAVE_CONFIG_H" /D for="if(0); else for" /D "_WINDOWS" /D "_USRDLL" /D "ifsmodule_EXPORTS" /D for="if (0); else for" /D "_MBCS" /D "WIN32" /Fp"$(INTDIR)\ifsmodule.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
+CPP_PROJ=/nologo /G6 /MD /W3 /GX /O2 /Ob2 /I "../../.." /I "../../../util/include/" /I "../../../types/src/ifstype" /I "../../../types/src/framebuffertype" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include/compatibility" /I "../../../util/include" /I "../../../util/src/misc" /D "NDEBUG" /D "HAVE_CONFIG_H" /D for="if(0); else for" /D "_WINDOWS" /D "_USRDLL" /D "ifsmodule_EXPORTS" /D for="if (0); else for" /D "_MBCS" /D "WIN32" /Fp"$(INTDIR)\ifsmodule.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /c
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ifsmodule.bsc"
BSC32_SBRS= \
@@ -144,42 +114,8 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /G6 /MDd /W2 /Gm /GX /ZI /Od /I "../../../" /I "../../../types/src/ifstype" /I "../../../types/src/framebuffertype" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include/compatibility" /I "../../../util/include" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "ifsmodule_EXPORTS" /D for="if (0); else for" /D "_MBCS" /D "WIN32" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\ifsmodule.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
+CPP_PROJ=/nologo /G6 /MDd /W2 /Gm /GX /ZI /Od /I "../../../" /I "../../../types/src/ifstype" /I "../../../types/src/framebuffertype" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include/compatibility" /I "../../../util/include" /I "../../../util/src/misc" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "ifsmodule_EXPORTS" /D for="if (0); else for" /D "_MBCS" /D "WIN32" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\ifsmodule.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /GZ /c
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ifsmodule.bsc"
BSC32_SBRS= \
@@ -214,6 +150,36 @@
!ENDIF
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("ifsmodule.dep")
@@ -227,12 +193,12 @@
!IF "$(CFG)" == "ifsmodule - Win32 Release" || "$(CFG)" == "ifsmodule - Win32 Debug"
SOURCE=.\ifsmodule.cpp
-"$(INTDIR)\ifsmodule.obj" : $(SOURCE) "$(INTDIR)" ".\ifsmodule.h" "..\..\..onfig.h"
+"$(INTDIR)\ifsmodule.obj" : $(SOURCE) "$(INTDIR)" "..\..\..onfig.h" ".\ifsmodule.h"
SOURCE=.\ifsmodule_auto.c
-"$(INTDIR)\ifsmodule_auto.obj" : $(SOURCE) "$(INTDIR)" ".\ifsmodule.h" "..\..\..onfig.h"
+"$(INTDIR)\ifsmodule_auto.obj" : $(SOURCE) "$(INTDIR)" "..\..\..onfig.h" ".\ifsmodule.h"
SOURCE=..\..\..onfig_h.win32