cacalabs
/
libcaca
mirror of https://github.com/cacalabs/libcaca.git
1
0
Fork 0
Code Issues 0 Releases 7 Wiki Activity
Browse Source

Renamed msvc into win32.

tags/v0.99.beta16
Sam Hocevar sam 17 years ago
parent
f3c3eac054
commit
e8f04805fd
11 changed files with 23 additions and 25 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      Makefile.am
  2. +4
    -4
      caca/libcaca.vcproj
  3. +1
    -1
      configure.ac
  4. +3
    -3
      cxx/libcaca++.vcproj
  5. +2
    -2
      cxx/test-cxx.vcproj
  6. +3
    -3
      src/cacademo.vcproj
  7. +3
    -3
      src/cacafire.vcproj
  8. +3
    -3
      src/cacaview.vcproj
  9. +0
    -0
      win32/Makefile.am
  10. +0
    -0
      win32/caca_types.h
  11. +3
    -5
      win32/config.h

+ 1
- 1
Makefile.am View File

@@ -1,7 +1,7 @@
# $Id$ # $Id$


SUBDIRS = kernel caca src examples tests tools csharp cxx python ruby doc SUBDIRS = kernel caca src examples tests tools csharp cxx python ruby doc
DIST_SUBDIRS = $(SUBDIRS) msvc
DIST_SUBDIRS = $(SUBDIRS) win32


EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in libcaca.spec EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in libcaca.spec
AUTOMAKE_OPTIONS = dist-bzip2 AUTOMAKE_OPTIONS = dist-bzip2


+ 4
- 4
caca/libcaca.vcproj View File

@@ -38,7 +38,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\msvc"
AdditionalIncludeDirectories="..\win32"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__LIBCACA__" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__LIBCACA__"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@@ -114,7 +114,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\msvc"
AdditionalIncludeDirectories="..\win32"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__LIBCACA__" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__LIBCACA__"
RuntimeLibrary="2" RuntimeLibrary="2"
WarningLevel="3" WarningLevel="3"
@@ -186,11 +186,11 @@
> >
</File> </File>
<File <File
RelativePath="..\msvc\caca_types.h"
RelativePath="..\win32\caca_types.h"
> >
</File> </File>
<File <File
RelativePath="..\msvc\config.h"
RelativePath="..\win32\config.h"
> >
</File> </File>
</Filter> </Filter>


+ 1
- 1
configure.ac View File

@@ -494,7 +494,7 @@ AC_CONFIG_FILES([
python/Makefile python/Makefile
ruby/Makefile ruby/Makefile
doc/Makefile doc/Makefile
msvc/Makefile
win32/Makefile
]) ])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
caca/caca_types.h caca/caca_types.h


+ 3
- 3
cxx/libcaca++.vcproj View File

@@ -38,7 +38,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\msvc;..\caca"
AdditionalIncludeDirectories="..\win32;..\caca"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__LIBCACA_PP__" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__LIBCACA_PP__"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@@ -114,7 +114,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\msvc;..\caca"
AdditionalIncludeDirectories="..\win32;..\caca"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__LIBCACA_PP__" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__LIBCACA_PP__"
RuntimeLibrary="2" RuntimeLibrary="2"
WarningLevel="3" WarningLevel="3"
@@ -178,7 +178,7 @@
> >
</File> </File>
<File <File
RelativePath="..\msvc\config.h"
RelativePath="..\win32\config.h"
> >
</File> </File>
</Filter> </Filter>


+ 2
- 2
cxx/test-cxx.vcproj View File

@@ -40,7 +40,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;..\msvc;..\caca"
AdditionalIncludeDirectories=".;..\win32;..\caca"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".;..\msvc;..\caca"
AdditionalIncludeDirectories=".;..\win32;..\caca"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"


+ 3
- 3
src/cacademo.vcproj View File

@@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\msvc;..\caca"
AdditionalIncludeDirectories="..\win32;..\caca"
PreprocessorDefinitions="LIBCACA=1" PreprocessorDefinitions="LIBCACA=1"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@@ -125,7 +125,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="..\msvc;..\caca"
AdditionalIncludeDirectories="..\win32;..\caca"
PreprocessorDefinitions="LIBCACA=1" PreprocessorDefinitions="LIBCACA=1"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@@ -189,7 +189,7 @@
Name="Header Files" Name="Header Files"
> >
<File <File
RelativePath="..\msvc\config.h"
RelativePath="..\win32\config.h"
> >
</File> </File>
</Filter> </Filter>


+ 3
- 3
src/cacafire.vcproj View File

@@ -40,7 +40,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\msvc;..\caca"
AdditionalIncludeDirectories="..\win32;..\caca"
PreprocessorDefinitions="LIBCACA=1" PreprocessorDefinitions="LIBCACA=1"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@@ -124,7 +124,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="..\msvc;..\caca"
AdditionalIncludeDirectories="..\win32;..\caca"
PreprocessorDefinitions="LIBCACA=1" PreprocessorDefinitions="LIBCACA=1"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@@ -188,7 +188,7 @@
Name="Header Files" Name="Header Files"
> >
<File <File
RelativePath="..\msvc\config.h"
RelativePath="..\win32\config.h"
> >
</File> </File>
</Filter> </Filter>


+ 3
- 3
src/cacaview.vcproj View File

@@ -40,7 +40,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\msvc;..\caca;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;"
AdditionalIncludeDirectories="..\win32;..\caca;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@@ -122,7 +122,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="..\msvc"
AdditionalIncludeDirectories="..\win32"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@@ -193,7 +193,7 @@
> >
</File> </File>
<File <File
RelativePath="..\msvc\config.h"
RelativePath="..\win32\config.h"
> >
</File> </File>
</Filter> </Filter>


msvc/Makefile.am → win32/Makefile.am View File


msvc/caca_types.h → win32/caca_types.h View File


msvc/config.h → win32/config.h View File

@@ -36,12 +36,11 @@
#define HAVE_WINDOWS_H 1 #define HAVE_WINDOWS_H 1
/* #undef HAVE_X11_XKBLIB_H */ /* #undef HAVE_X11_XKBLIB_H */
/* #undef NO_MINUS_C_MINUS_O */ /* #undef NO_MINUS_C_MINUS_O */
#define PACKAGE "libcaca"
#define PACKAGE_BUGREPORT "" #define PACKAGE_BUGREPORT ""
#define PACKAGE_NAME ""
#define PACKAGE_NAME "libcaca"
#define PACKAGE_STRING "" #define PACKAGE_STRING ""
#define PACKAGE_TARNAME "" #define PACKAGE_TARNAME ""
#define PACKAGE_VERSION ""
#define PACKAGE_VERSION "0.99.beta15"
/* #undef RETSIGTYPE */ /* #undef RETSIGTYPE */
/* #undef SCREENUPDATE_IN_PC_H */ /* #undef SCREENUPDATE_IN_PC_H */
#define STDC_HEADERS 1 #define STDC_HEADERS 1
@@ -50,10 +49,9 @@
/* #undef USE_SLANG */ /* #undef USE_SLANG */
#define USE_WIN32 1 #define USE_WIN32 1
/* #undef USE_X11 */ /* #undef USE_X11 */
#define VERSION "0.99.beta14"
/* #undef const */ /* #undef const */
#ifndef __cplusplus #ifndef __cplusplus
#define inline __inline #define inline __inline
#endif #endif
#define strcasecmp stricmp #define strcasecmp stricmp
#define snprintf _snprintf
#define snprintf _snprintf

Write Preview
Loading…
Cancel
Save