Use kLIBC and GNU Make

    modified:   BitmapHeader.hpp
    modified:   Icon.cpp
    modified:   Icon.hpp
    modified:   IconDir.hpp
    modified:   IconDirEntry.hpp
    modified:   IconImage.hpp
    modified:   IconMgr.cpp
    modified:   IconMgr.hpp
    modified:   IconsVar.cpp
    modified:   IconsVar.hpp
    new file:   Makefile
    new file:   Makefile.common
    modified:   RgbQuad.hpp
    modified:   intro.cpp
    modified:   main.cpp

src/BitmapHeader.hpp

@@ -1,3 +1,6 @@
+#ifndef BITMAP_HEADER_HPP
+#define BITMAP_HEADER_HPP
+
 #include <os2.h>
 
 class BitmapHeader{
@@ -101,4 +104,6 @@ class BitmapHeader{
       ULONG getBiClrImportant(){
          return biClrImportant;
       }
-   };
+   };
+
+#endif

src/Icon.cpp

@@ -1,3 +1,8 @@
+#include <cstdlib>
+#include <cstring>
+
+#include "Icon.hpp"
+
 int Os2Icon::ipow(int b, int e){
    int p=b;
    while(--e)

src/Icon.hpp

@@ -1,7 +1,13 @@
+#ifndef ICON_HPP
+#define ICON_HPP
+
 #define INCL_GPIBITMAPS
 #define INCL_GPI
 #include <os2.h>
 
+#include "IconsVar.hpp"
+#include "IconImage.hpp"
+
 struct IconError{
    const char* msg;
    const char* function;
@@ -126,3 +132,4 @@ class Os2Icon20:public Os2Icon{
 
 };
 
+#endif

src/IconDir.hpp

@@ -1,3 +1,8 @@
+#ifndef ICON_DIR_HPP
+#define ICON_DIR_HPP
+
+#include "IconDirEntry.hpp"
+
 class IconDir{
 
    USHORT   idReserved;
@@ -25,7 +30,7 @@ class IconDir{
       USHORT getIdCount(){
          return idCount;
       }
-      vector<IconDirEntry*> getIdEntries(){
+      std::vector<IconDirEntry*> getIdEntries(){
          return idEntries;
       }
 
@@ -41,6 +46,8 @@ class IconDir{
          idCount = valor;
          }
 
-      vector<IconDirEntry*> idEntries;
+      std::vector<IconDirEntry*> idEntries;
 
 };
+
+#endif

src/IconDirEntry.hpp

@@ -1,3 +1,6 @@
+#ifndef ICON_DIR_ENTRY_HPP
+#define ICON_DIR_ENTRY_HPP
+
 class IconDirEntry{
    BYTE  bWidth;
    BYTE  bHeight;
@@ -53,3 +56,5 @@ class IconDirEntry{
          return datosImagen;
       }
    };
+
+#endif

src/IconImage.hpp

@@ -1,3 +1,9 @@
+#ifndef ICON_IMAGE_HPP
+#define ICON_IMAGE_HPP
+
+#include "BitmapHeader.hpp"
+#include "RgbQuad.hpp"
+
 class IconImage{
    public:
       IconImage();
@@ -65,4 +71,6 @@ class IconImage{
       PBYTE icAnd;
       int numcolores;
       int numBytesInImg;
-};
+};
+
+#endif

src/IconMgr.cpp

@@ -1,3 +1,9 @@
+#include <iostream>
+
+#include "IconMgr.hpp"
+
+using namespace std;
+
 #define ICONO_20X20  20
 #define ICONO_40X40  40
 

src/IconMgr.hpp

@@ -1,8 +1,12 @@
+#ifndef ICON_MGR_HPP
+#define ICON_MGR_HPP
+
 #include <vector>
 #include <iterator>
 #include <algorithm>
 
-using namespace std;
+#include "Icon.hpp"
+#include "IconDir.hpp"
 
 class IconMgr{
    public:
@@ -12,6 +16,7 @@ class IconMgr{
       int identidad;
 };
 
+class Os2IconMgr12;     // forward declaration
 
 class WiconMgr:public IconMgr{
    public:
@@ -50,7 +55,7 @@ class Os2IconMgr:public IconMgr{
       PBYTE centerImageData(PBYTE data, const int tamanio, int bits);
       int numImages;
    private:
-      vector<Os2Icon> *listaiconos;
+      std::vector<Os2Icon> *listaiconos;
 };
 
 class Os2IconMgr12:public Os2IconMgr{
@@ -72,7 +77,7 @@ class Os2IconMgr12:public Os2IconMgr{
       void llenaOffSets();
       ULONG sizeAllPaletas();
       ULONG firstOffSet();
-      vector<Os2Icon12*> listaImagenes;
+      std::vector<Os2Icon12*> listaImagenes;
 };
 
 class Os2IconMgr20:public Os2IconMgr{
@@ -84,7 +89,8 @@ class Os2IconMgr20:public Os2IconMgr{
       ULONG firstOffSet();
       void llenaOffSets();
    private:
-      vector<Os2Icon20> *listaiconos;
+      std::vector<Os2Icon20> *listaiconos;
       int freeIconMem();
 };
 
+#endif

src/IconsVar.cpp

@@ -1,3 +1,5 @@
+#include "IconsVar.hpp"
+
 IconBIH::IconBIH(){
    cbFix       = 0;
    cx          = 0;

src/IconsVar.hpp

@@ -1,3 +1,7 @@
+#ifndef ICONS_VAR_HPP
+#define ICONS_VAR_HPP
+
+#define INCL_GPI
 #include <os2.h>
 
 class IconBIH{
@@ -53,3 +57,5 @@ class IconAFH{
       USHORT      cxDisplay;
       USHORT      cyDisplay;
 };
+
+#endif

src/Makefile

@@ -0,0 +1,125 @@
+#
+#   Configuration parts of GNU Make/GCC build system.
+#   Copyright (C) 2014 by KO Myung-Hun <[email protected]>
+#
+#   This file is part of GNU Make/GCC build system.
+#
+#   This program is free software. It comes without any warranty, to
+#   the extent permitted by applicable law. You can redistribute it
+#   and/or modify it under the terms of the Do What The Fuck You Want
+#   To Public License, Version 2, as published by Sam Hocevar. See
+#   http://www.wtfpl.net/ for more details.
+#
+
+##### Configuration parts that you can modify
+
+# specify sub directories
+SUBDIRS :=
+
+# specify gcc compiler flags for all the programs
+CFLAGS :=
+
+# specify g++ compiler flags for all the programs
+CXXFLAGS := -DOS2EMX_PLAIN_CHAR=1
+
+# specify linker flags such as -L option for all the programs
+LDFLAGS :=
+
+# specify dependent libraries such as -l option for all the programs
+LDLIBS :=
+
+ifdef RELEASE
+# specify flags for release mode
+CFLAGS   +=
+CXXFLAGS +=
+LDFLAGS  +=
+else
+# specify flags for debug mode
+CFLAGS   +=
+CXXFLAGS +=
+LDFLAGS  +=
+endif
+
+# specify resource compiler, default is rc if not set
+RC :=
+
+# specify resource compiler flags
+RCFLAGS :=
+
+# Variables for programs
+#
+# 1. specify a list of programs without an extension with
+#
+#   BIN_PROGRAMS
+#
+# Now, assume
+#
+#   BIN_PROGRAMS := program
+#
+# 2. specify sources for a specific program with
+#
+#   program_SRCS
+#
+# the above is REQUIRED
+#
+# 3. specify various OPTIONAL flags for a specific program with
+#
+#   program_CFLAGS      for gcc compiler flags
+#   program_CXXFLAGS    for g++ compiler flags
+#   program_LDFLAGS     for linker flags
+#   program_LDLIBS      for dependent libraries
+#   program_RCSRC       for rc source
+#   program_RCFLAGS     for rc flags
+#   program_DEF         for .def file
+#   program_EXTRADEPS   for extra dependencies
+
+BIN_PROGRAMS := winico
+
+winico_SRCS := intro.cpp main.cpp Icon.cpp IconMgr.cpp IconsVar.cpp
+
+# Variables for libraries
+#
+# 1. specify a list of libraries without an extension with
+#
+#   BIN_LIBRARIES
+#
+# Now, assume
+#
+#   BIN_PROGRAMS := library
+#
+# 2. specify sources for a specific library with
+#
+#   library_SRCS
+#
+# the above is REQUIRED
+#
+# 3. set library type flags for a specific library to a non-empty value
+#
+#   library_LIB         to create a static library
+#   library_DLL         to build a DLL
+#
+# either of the above SHOULD be SET
+#
+# 4. specify various OPTIONAL flags for a specific library with
+#
+#   library_CFLAGS      for gcc compiler flags
+#   library_CXXFLAGS    for g++ compiler flags
+#
+# the above is common for LIB and DLL
+#
+#   library_DLLNAME     for customized DLL name without an extension
+#   library_LDFLAGS     for linker flags
+#   library_LDLIBS      for dependent libraries
+#   library_RCSRC       for rc source
+#   library_RCFLAGS     for rc flags
+#   library_DEF         for .def file, if not set all the symbols are exported
+#   library_NO_DEF      if set, .def file is not generated automatically
+#   library_EXTRADEPS   for extra dependencies
+#
+# the above is only for DLL
+
+BIN_LIBRARIES :=
+
+include Makefile.common
+
+# additional stuffs